Merge into master for v2.1.0 release

Python/ClientWidget.py

@@ -21,7 +21,7 @@ def __init__(self, client, gui):
         if client is not None:
             self.client = client
         else:
-            self.client = ClientWidget(commandable=False, gui=gui) # this needs a gui
+            self.client = ClientWidget(commandable=False, gui=gui)  # this needs a gui
         self.setWindowTitle("Connection")
         self.layout = QtWidgets.QVBoxLayout()
         self.layout.addWidget(self.client)
@@ -33,11 +33,11 @@ class ClientWidget(QtWidgets.QWidget):
     gotConnectionToServerSignal = pyqtSignal()
     serverDisconnectSignal = pyqtSignal()
 
-    def __init__(self, commandable: bool=True, gui = None, *args, **kwargs):
+    def __init__(self, commandable: bool = True, gui=None, *args, **kwargs):
 
         super().__init__(*args, **kwargs)
         self.clientid = uuid.uuid4().hex
-        #self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        # self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.command_queue = queue.Queue()
         self.is_commander = False
         self.is_connected = False
@@ -53,20 +53,25 @@ def __init__(self, commandable: bool=True, gui = None, *args, **kwargs):
         self.connection_layout = QtWidgets.QGridLayout()
         self.connection_widget.setLayout(self.connection_layout)
         self.host = QtWidgets.QComboBox()
-        self.host.addItems([socket.gethostbyname(
-            socket.gethostname()), '192.168.50.79', 'masadataserver'])
+        self.host.addItems(
+            [
+                socket.gethostbyname(socket.gethostname()),
+                "192.168.50.79",
+                "masadataserver",
+            ]
+        )
         self.host.setEditable(True)
         self.connection_layout.addWidget(self.host, 0, 0)
         self.port = QtWidgets.QLineEdit()
         self.connection_layout.addWidget(self.port, 0, 2)
-        self.connection_layout.addWidget(QtGui.QLabel(":"), 0, 1)
-        self.connect_button = QtGui.QPushButton("Connect")
+        self.connection_layout.addWidget(QtWidgets.QLabel(":"), 0, 1)
+        self.connect_button = QtWidgets.QPushButton("Connect")
         self.connection_layout.addWidget(self.connect_button, 0, 3)
         self.connect_button.clicked.connect(lambda: self.connect())
-        self.disconnect_button = QtGui.QPushButton("Disconnect")
+        self.disconnect_button = QtWidgets.QPushButton("Disconnect")
         self.connection_layout.addWidget(self.disconnect_button, 0, 4)
         self.disconnect_button.clicked.connect(lambda: self.disconnect())
-        self.clientid_label = QtGui.QLabel("UUID: %s" % self.clientid)
+        self.clientid_label = QtWidgets.QLabel("UUID: %s" % self.clientid)
         self.connection_layout.setColumnStretch(0, 4)
         self.connection_layout.setColumnStretch(1, 0)
         self.connection_layout.setColumnStretch(2, 2)
@@ -78,7 +83,7 @@ def __init__(self, commandable: bool=True, gui = None, *args, **kwargs):
         self.command_layout = QtWidgets.QGridLayout()
         self.command_widget.setLayout(self.command_layout)
         self.command_layout.addWidget(self.clientid_label, 0, 0)
-        self.control_button = QtGui.QPushButton("Take/Give Control")
+        self.control_button = QtWidgets.QPushButton("Take/Give Control")
         self.command_layout.addWidget(self.control_button, 0, 1)
         self.control_button.clicked.connect(lambda: self.command_toggle())
         self.led = LedIndicator(self)
@@ -99,23 +104,24 @@ def __init__(self, commandable: bool=True, gui = None, *args, **kwargs):
         # self.host.setText(socket.gethostbyname(socket.gethostname()))
         self.port.setText(str(6969))
 
-    def command(self, command: int, args: tuple=()):
+    def command(self, command: int, args: tuple = ()):
         # build and add command to queue
-        command_dict = {
-            "clientid": self.clientid,
-            "command": command,
-            "args": args
-        }
+        command_dict = {"clientid": self.clientid, "command": command, "args": args}
 
         msg = pickle.dumps(command_dict)
         # print(msg)
 
         if command != 0:
             print(command_dict)
             if command_dict["command"] == 3:
-                self._gui.setStatusBarMessage("Command sent to server: " + str(command_dict["args"]))
+                self._gui.setStatusBarMessage(
+                    "Command sent to server: " + str(command_dict["args"])
+                )
             else:
-                self._gui.setStatusBarMessage("Command sent to client: " + str(command_dict))
+                # TODO: What??
+                self._gui.setStatusBarMessage(
+                    "Command sent to client: " + str(command_dict)
+                )
 
         # add to queue
         if self.is_connected:
@@ -127,19 +133,35 @@ def connect(self):
             # setup socket interface
             self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.s.settimeout(1)
-            self.s.connect((self.host.currentText(), int(
-                self.port.text())))  # connect to socket
-            self.s.settimeout(None)  #  from https://stackoverflow.com/questions/3432102/python-socket-connection-timeout to prevent blocking
+            self.s.connect(
+                (self.host.currentText(), int(self.port.text()))
+            )  # connect to socket
+            self.s.settimeout(
+                None
+            )  #  from https://stackoverflow.com/questions/3432102/python-socket-connection-timeout to prevent blocking
             self.is_connected = True  # update status
+            self.command(11)
             self.gotConnectionToServerSignal.emit()
-            print("Connected to server on " + self.host.currentText() + ":" + self.port.text())
-            self._gui.setStatusBarMessage("Connected to server on " + self.host.currentText() + ":" + self.port.text())
+            print(
+                "Connected to server on "
+                + self.host.currentText()
+                + ":"
+                + self.port.text()
+            )
+            self._gui.setStatusBarMessage(
+                "Connected to server on "
+                + self.host.currentText()
+                + ":"
+                + self.port.text()
+            )
 
         except Exception as e:
             print(traceback.format_exc())
-            self._gui.setStatusBarMessage("Error connecting to server, see terminal", True)
+            self._gui.setStatusBarMessage(
+                "Error connecting to server, see terminal", True
+            )
             self.soft_disconnect()
-        #print(self.is_connected)
+        # print(self.is_connected)
 
     def disconnect(self):
         """
@@ -149,20 +171,23 @@ def disconnect(self):
         some client side actions for cleanup
         :return: None
         """
-
-        self.command(4)
-        self.cycle()  # need to get the last command out before saying we are disconnected
-        self.soft_disconnect()
-        self._gui.setStatusBarMessage("Disconnected from server")
+        # Make sure we are actually connected before we try to disconnect
+        if self.is_connected:
+            self.command(4)
+            self.cycle()  # need to get the last command out before saying we are disconnected
+            self.soft_disconnect()
 
     def soft_disconnect(self):
         """
         Performs all the required steps when client and server are disconnected, however it does not send any commands
         to the server that indicate the client is attempting to disconnect. See above disconnect for more
         :return:
         """
+        self.s.close()
         self.is_connected = False
         self.serverDisconnectSignal.emit()  # See gui class for what needs to be done
+        self._gui.setStatusBarMessage("Disconnected from server")
+        print("Disconnected from server")
 
     def command_toggle(self):
         # toggle to take/give up command
@@ -196,7 +221,7 @@ def cycle(self):
                 self.s.sendall(data)
 
                 # get data
-                data = self.s.recv(4096*4)
+                data = self.s.recv(4096 * 4)
                 packet = pickle.loads(data)
             else:
                 packet = None
@@ -206,17 +231,21 @@ def cycle(self):
                 self.is_commander = False
             elif packet["commander"] is None:
                 self.is_commander = False
-            elif packet["commander"] == hashlib.sha256(self.clientid.encode('utf-8')).hexdigest():
+            elif (
+                packet["commander"]
+                == hashlib.sha256(self.clientid.encode("utf-8")).hexdigest()
+            ):
                 self.is_commander = True
             else:
                 self.is_commander = False
             self.led.setChecked(self.is_commander)
 
             self.last_packet = packet
             return self.last_packet
-
-        except Exception as e:
-            if not isinstance(e, EOFError):
-                traceback.print_exc()
+        except (EOFError, ConnectionResetError):
+            self.soft_disconnect()
+            return None
+        except Exception:
             self.soft_disconnect()
+            traceback.print_exc()
             return None

Python/ColorButton.py

@@ -3,12 +3,12 @@
 
 # color picker button based on: https://www.mfitzp.com/article/qcolorbutton-a-color-selector-tool-for-pyqt/
 class ColorButton(QtWidgets.QPushButton):
-    '''
+    """
     Custom Qt Widget to show a chosen color.
 
     Left-clicking the button shows the color-chooser, while
-    right-clicking resets the color to None (no-color).    
-    '''
+    right-clicking resets the color to None (no-color).
+    """
 
     colorChanged = QtCore.pyqtSignal()
 
@@ -34,15 +34,15 @@ def color(self):
         return self._color
 
     def onColorPicker(self):
-        '''
+        """
         Show color-picker dialog to select color.
 
         Qt will use the native dialog by default.
 
-        '''
+        """
         self.setStyleSheet("")
         dlg = QtWidgets.QColorDialog(self)
-        
+
         if self._color:
             dlg.setCurrentColor(QtGui.QColor(self._color))
 
@@ -53,4 +53,4 @@ def mousePressEvent(self, e):
         if e.button() == Qt.RightButton:
             self.setColor("#FF0000")
 
-        return super(ColorButton, self).mousePressEvent(e)
+        return super(ColorButton, self).mousePressEvent(e)

Python/Configurations/Configurations/limits.cfg

@@ -0,0 +1 @@
+{"num_channels": 2, "limit_configs": [{"channel": "gse.e_batt", "low": "10", "high": "100"}, {"channel": "ec.e_batt", "low": "10", "high": "100"}]}

Python/GUI.py

@@ -21,13 +21,12 @@
 
 
 class GUI(BaseGui):  # Inherits QObject just so signals can be used
-
     def __init__(self, qapp: QApplication):
         super().__init__(qapp)  # This calls above BaseGui __init__
 
         # This variable holds the current Run class that is being used to conduct the test
         self.campaign = Campaign(self)
-        #self.configuration = ConfigurationManager(self)
+        # self.configuration = ConfigurationManager(self)
 
         # If in debug mode the gui overrides the command sending and instead shows what would happen if successful
         self.debug_mode = False
@@ -58,7 +57,9 @@ def gotConnectionToServer(self):
         else:
             self.liveDataHandler.sendCommand(6, [str(self.campaign.saveName)])
             if self.campaign.isTestActive:
-                self.liveDataHandler.sendCommand(10, [self.campaign.saveName, self.campaign.currentTestName, True])
+                self.liveDataHandler.sendCommand(
+                    10, [self.campaign.saveName, self.campaign.currentTestName, True]
+                )
 
             self.controlsWindow.centralWidget.controlsSidebarWidget.tabWidget.noteWidget.enableNoteCreation()
 
@@ -70,27 +71,33 @@ def serverDisconnect(self):
         """
         super().serverDisconnect()
         self.controlsWindow.startRunAct.setDisabled(True)
-        self.controlsWindow.centralWidget.controlsSidebarWidget.tabWidget.noteWidget.disableNoteCreation(True)
+        self.controlsWindow.centralWidget.controlsSidebarWidget.tabWidget.noteWidget.disableNoteCreation(
+            True
+        )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
     currentExitCode = GUI.EXIT_CODE_REBOOT
     while currentExitCode == GUI.EXIT_CODE_REBOOT:
 
         QApplication.setAttribute(Qt.AA_EnableHighDpiScaling, True)
         QApplication.setAttribute(Qt.AA_UseHighDpiPixmaps, True)
         os.environ["QT_ENABLE_HIGHDPI_SCALING"] = "1"
-        QApplication.setHighDpiScaleFactorRoundingPolicy(Qt.HighDpiScaleFactorRoundingPolicy.PassThrough)
+        QApplication.setHighDpiScaleFactorRoundingPolicy(
+            Qt.HighDpiScaleFactorRoundingPolicy.PassThrough
+        )
         app = QApplication(sys.argv)
         app.setApplicationName("MASA GUI")
         app.setApplicationDisplayName("MASA GUI")
 
         gui = GUI(app)
 
-        QTimer.singleShot(100, gui.postInit)  # Need to call this after exec_ for proper screen placement
+        QTimer.singleShot(
+            100, gui.postInit
+        )  # Need to call this after exec_ for proper screen placement
         currentExitCode = app.exec_()
         gui.savePreferences()
         app = None
 
-#https://stackoverflow.com/questions/8356336/how-to-capture-output-of-pythons-interpreter-and-show-in-a-text-widget
+# https://stackoverflow.com/questions/8356336/how-to-capture-output-of-pythons-interpreter-and-show-in-a-text-widget

Python/MathHelper.py

@@ -1,9 +1,9 @@
-
 """
 Helper class with various mth functions
 """
-class MathHelper:
 
+
+class MathHelper:
     @staticmethod
     def mapValue(value, leftMin, leftMax, rightMin, rightMax):
         """

Python/README.md

@@ -0,0 +1,44 @@
+
+# Getting Started
+
+```commandline
+python --version
+```
+
+If you don't have 3.11 installed, you're a satanist. Install 3.11.
+
+```commandline
+pip --version
+```
+
+If this isn't pip for 3.11, see above. Then, 
+
+```commandline
+pip install poetry
+```
+
+Then, in the root level of the repo, run
+
+```commandline
+poetry install
+```
+
+Then, open two terminals and start virtual environments:
+
+```commandline
+poetry shell
+```
+
+Then, cd into the `Python` directory and run
+
+```commandline
+python server.py
+```
+
+To start the server in one shell, and run
+
+```commandline
+python gui.py
+```
+
+To start the GUI in another