From 8d56cdb191f14b56ab2caa5ebd2948a719984d32 Mon Sep 17 00:00:00 2001
From: Ilya Zhuravlev <whatever@xyz.is>
Date: Mon, 10 May 2021 13:52:41 -0400
Subject: [PATCH] matrix_test: minor codestyle

---
 src/main/python/matrix_test.py | 43 ++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/main/python/matrix_test.py b/src/main/python/matrix_test.py
index 3d22800..2ac22f7 100644
--- a/src/main/python/matrix_test.py
+++ b/src/main/python/matrix_test.py
@@ -1,6 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 from PyQt5.QtWidgets import QVBoxLayout, QPushButton
 from PyQt5.QtCore import Qt, QTimer
-import struct
+
 import math
 
 from basic_editor import BasicEditor
@@ -8,6 +9,7 @@ from keyboard_widget import KeyboardWidget
 from vial_device import VialKeyboard
 from unlocker import Unlocker
 
+
 class MatrixTest(BasicEditor):
     def __init__(self, layout_editor):
         super().__init__()
@@ -35,7 +37,7 @@ class MatrixTest(BasicEditor):
         self.timer = QTimer()
         self.timer.timeout.connect(self.matrix_poller)
 
-        self.startButtonWidget.clicked.connect(self.start_poller)
+        self.startButtonWidget.clicked.connect(self.toggle)
         self.resetButtonWidget.clicked.connect(self.reset_keyboard_widget)
 
     def rebuild(self, device):
@@ -54,7 +56,7 @@ class MatrixTest(BasicEditor):
         for w in self.keyboardWidget.widgets:
             w.setPressed(False)
             w.setActive(False)
-        
+
         self.keyboardWidget.update_layout()
         self.keyboardWidget.update()
         self.keyboardWidget.updateGeometry()
@@ -64,21 +66,21 @@ class MatrixTest(BasicEditor):
         rows = self.keyboard.rows
         cols = self.keyboard.cols
         # Generate 2d array of matrix
-        matrix = [ [None for y in range(cols)] for x in range(rows) ]
+        matrix = [[None] * cols for x in range(rows)]
 
         # Get matrix data from keyboard
         data = self.keyboard.matrix_poll()
-        # 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.
+        # 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.
         row_size = math.ceil(cols / 8)
 
-
         for row in range(rows):
             # Make slice of bytes for the row (skip first 2 bytes, they're for VIAL)
             row_data_start = 2 + (row * row_size)
             row_data_end = row_data_start + row_size
             row_data = data[row_data_start:row_data_end]
 
-            #Get each bit representing pressed state for col
+            # Get each bit representing pressed state for col
             for col in range(cols):
                 # row_data is array of bytes, calculate in which byte the col is located
                 col_byte = len(row_data) - 1 - math.floor(col / 8)
@@ -97,20 +99,25 @@ class MatrixTest(BasicEditor):
                     w.setPressed(matrix[row][col])
                     if matrix[row][col]:
                         w.setActive(True)
-        
+
         self.keyboardWidget.update_layout()
         self.keyboardWidget.update()
         self.keyboardWidget.updateGeometry()
 
-    def start_poller(self):
+    def start(self):
+        Unlocker.unlock(self.keyboard)
+        self.startButtonWidget.setText("Stop testing")
+        self.timer.start(20)
+        self.polling = True
+
+    def stop(self):
+        self.timer.stop()
+        self.keyboard.lock()
+        self.startButtonWidget.setText("Start testing")
+        self.polling = False
+
+    def toggle(self):
         if not self.polling:
-            Unlocker.unlock(self.keyboard)
-            self.startButtonWidget.setText("Stop testing")
-            self.timer.start(20)
-            self.polling = True
+            self.start()
         else:
-            self.timer.stop()
-            self.keyboard.lock()
-            self.startButtonWidget.setText("Start testing")
-            self.polling = False
-        
+            self.stop()