Feature/comportdetection

EBEAM-Dashboard-Logs/initiated_app_while_sic_in_error_mode_log_2024-11-11_16-27-32.txt

@@ -0,0 +1,32 @@
+[16:27:18] - ERROR: Error opening serial port DUMMY_COM1: could not open port 'DUMMY_COM1': FileNotFoundError(2, 'The system cannot find the file specified.', None, 2)
+[16:27:19] - ERROR: Failed to open serial port COM11: could not open port 'COM11': FileNotFoundError(2, 'The system cannot find the file specified.', None, 2)
+[16:27:19] - INFO: G9 driver initialized
+[16:27:20] - ERROR: Exception while initializing temperature controllers at DUMMY_COM5: 'ModbusSerialClient' object has no attribute 'port'
+[16:27:20] - ERROR: Error opening serial port DUMMY_COM2: could not open port 'DUMMY_COM2': FileNotFoundError(2, 'The system cannot find the file specified.', None, 2)
+[16:27:20] - DEBUG: Raw command sent: SABC3
+[16:27:20] - ERROR: Failed to initialize CathodeA PS on port DUMMY_COM2: 'NoneType' object has no attribute 'write'
+[16:27:20] - ERROR: Error opening serial port DUMMY_COM3: could not open port 'DUMMY_COM3': FileNotFoundError(2, 'The system cannot find the file specified.', None, 2)
+[16:27:20] - DEBUG: Raw command sent: SABC3
+[16:27:20] - ERROR: Failed to initialize CathodeB PS on port DUMMY_COM3: 'NoneType' object has no attribute 'write'
+[16:27:20] - ERROR: Error opening serial port DUMMY_COM4: could not open port 'DUMMY_COM4': FileNotFoundError(2, 'The system cannot find the file specified.', None, 2)
+[16:27:20] - DEBUG: Raw command sent: SABC3
+[16:27:20] - ERROR: Failed to initialize CathodeC PS on port DUMMY_COM4: 'NoneType' object has no attribute 'write'
+[16:27:20] - DEBUG: Power supply 1 not initialized. Button disabled.
+[16:27:20] - DEBUG: Power supply 2 not initialized. Button disabled.
+[16:27:20] - DEBUG: Power supply 3 not initialized. Button disabled.
+[16:27:20] - DEBUG: No power supplies were initialized properly.
+[16:27:20] - DEBUG: No connection to CCS temperature controller 1
+[16:27:20] - DEBUG: No connection to CCS temperature controller 2
+[16:27:20] - DEBUG: No connection to CCS temperature controller 3
+[16:27:20] - WARNING: G9 driver not connected
+[16:27:21] - WARNING: G9 driver not connected
+[16:27:22] - WARNING: G9 driver not connected
+[16:27:23] - WARNING: G9 driver not connected
+[16:27:26] - WARNING: G9 driver not connected
+[16:27:26] - WARNING: G9 Connection issue. Update interval: 2530ms
+[16:27:29] - WARNING: G9 driver not connected
+[16:27:30] - DEBUG: No connection to CCS temperature controller 1
+[16:27:30] - DEBUG: No connection to CCS temperature controller 2
+[16:27:30] - DEBUG: No connection to CCS temperature controller 3
+[16:27:31] - WARNING: G9 driver not connected
+

com_ports.json

@@ -0,0 +1,25 @@
+{
+    "VTRXSubsystem": {
+        "com_port": "DUMMY_COM1"
+    },
+    "CathodeA PS": {
+        "com_port": "DUMMY_COM2"
+    },
+    "CathodeB PS": {
+        "com_port": "DUMMY_COM3"
+    },
+    "CathodeC PS": {
+        "com_port": "DUMMY_COM4"
+    },
+    "TempControllers": {
+        "com_port": "DUMMY_COM5"
+    },
+    "Interlocks": {
+        "com_port": "COM11",
+        "vid": 1027,
+        "pid": 24577,
+        "serial_number": "AD0K0ZIEA",
+        "manufacturer": "FTDI",
+        "description": "USB Serial Port (COM11)"
+    }
+}

dashboard.py

@@ -9,29 +9,38 @@
 from usr.panel_config import save_pane_states, load_pane_states, saveFileExists
 import serial.tools.list_ports
 
-
+# Only have the interlocks at the top of the display
+# title, row, width, height
 frames_config = [
-    ("Oil System", 0, 50, 150),
-    ("Visualization Gas Control", 0, 50, 150),
-    ("System Checks", 0, None, None),
-    ("Beam Extraction", 0, None, None),
-    ("Vacuum System", 1, 150, 300),
-    ("Deflection Monitor", 1, None, None),
-    ("Beam Pulse", 1, None, None),
-    ("Main Control", 1, 50, 300),
-    ("Setup Script", 2, None, 25),
-    ("Interlocks", 2, None, 25),
-    ("High Voltage Warning", 2, None, 25),
-    ("Environmental", 3, 150, 450),
-    ("Cathode Heating", 3, 960, 450),
+    ("Interlocks", 0, None, 2),  # Moved to the top row
+    ("Oil System", 1, 50, 150),
+    ("Visualization Gas Control", 2, 50, 150),
+    ("System Checks", 1, None, None),
+    ("Beam Extraction", 1, None, None),
+    ("Vacuum System", 2, 150, 300),
+    ("Deflection Monitor", 2, None, None),
+    ("Beam Pulse", 2, None, None),
+    ("Main Control", 2, 50, 300),
+    ("Setup Script", 3, None, 25),
+    ("High Voltage Warning", 3, None, 25),
+    ("Environmental", 4, 150, 450),
+    ("Cathode Heating", 4, 960, 450),
 ]
 
 class EBEAMSystemDashboard:
+    PORT_INFO = {
+        "AD0K0ZIEA" : "Interlocks"
+    }
     def __init__(self, root, com_ports):
         self.root = root
         self.com_ports = com_ports
+        self.set_com_ports = set(serial.tools.list_ports.comports())
+
         self.root.title("EBEAM Control System Dashboard")
 
+        # if save file exists call it and open it
+        if saveFileExists():
+             self.load_saved_pane_state()
 
         # if save file exists call it and open it
         if saveFileExists():
@@ -52,6 +61,9 @@ def __init__(self, root, com_ports):
         # Set up different subsystems within their respective frames
         self.create_subsystems()
 
+        # starts the constant check for the avavilbe com ports
+        self._check_for_port_changes()
+
     def setup_main_pane(self):
         """Initialize the main layout pane and its rows."""
         self.main_pane = tk.PanedWindow(self.root, orient='vertical', sashrelief=tk.RAISED)
@@ -73,7 +85,8 @@ def create_frames(self):
             else:
                 frame = tk.Frame(borderwidth=1, relief="solid")
             self.rows[row].add(frame, stretch='always')
-            self.add_title(frame, title)
+            if title != "Interlocks":
+                self.add_title(frame, title)
             self.frames[title] = frame
             if title == "Setup Script":
                 SetupScripts(frame)
@@ -153,6 +166,11 @@ def save_current_pane_state(self):
     def load_saved_pane_state(self):
         savedData = load_pane_states()
 
+        for i in range(len(frames_config)):
+            if frames_config[i][0] in savedData:
+                frames_config[i] = (frames_config[i][0], frames_config[i][1], savedData[frames_config[i][0]][0],savedData[frames_config[i][0]][1])
+        savedData = load_pane_states()
+
         for i in range(len(frames_config)):
             if frames_config[i][0] in savedData:
                 frames_config[i] = (frames_config[i][0], frames_config[i][1], savedData[frames_config[i][0]][0],savedData[frames_config[i][0]][1])
@@ -191,11 +209,13 @@ def create_subsystems(self):
                 logger=self.logger
             ),
             'Interlocks': subsystem.InterlocksSubsystem(
-                self.frames['Interlocks'], 
-                logger=self.logger
+                self.frames['Interlocks'],
+                com_ports = self.com_ports['Interlocks'],
+                logger=self.logger,
+                frames = self.frames
             ),
             'Oil System': subsystem.OilSubsystem(
-                self.frames['Oil System'], 
+                self.frames['Oil System'],
                 logger=self.logger
             ), 
             'Cathode Heating': subsystem.CathodeHeatingSubsystem(
@@ -207,25 +227,22 @@ def create_subsystems(self):
 
     def create_messages_frame(self):
         """Create a frame for displaying messages and errors."""
-        self.messages_frame = MessagesFrame(self.rows[3])
-        self.rows[3].add(self.messages_frame.frame, stretch='always')
+        self.messages_frame = MessagesFrame(self.rows[4])
+        self.rows[4].add(self.messages_frame.frame, stretch='always')
         self.logger = self.messages_frame.logger
 
     def create_com_port_frame(self, parent_frame):
         self.com_port_frame = ttk.Frame(parent_frame)
         self.com_port_frame.pack(side=tk.TOP, fill=tk.X, padx=5, pady=5)
 
-        self.com_port_button = ttk.Button(self.com_port_frame, text="Configure COM Ports", command=self.toggle_com_port_menu)
-        self.com_port_button.pack(side=tk.TOP, anchor='w')
-
         self.com_port_menu = ttk.Frame(self.com_port_frame)
         self.com_port_menu.pack(side=tk.TOP, fill=tk.X, expand=True)
         self.com_port_menu.pack_forget()  # Initially hidden
 
         self.port_selections = {}
         self.port_dropdowns = {}
 
-        for subsystem in ['VTRXSubsystem', 'CathodeA PS', 'CathodeB PS', 'CathodeC PS', 'TempControllers']:
+        for subsystem in ['VTRXSubsystem', 'CathodeA PS', 'CathodeB PS', 'CathodeC PS', 'TempControllers', 'Interlocks']:
             frame = ttk.Frame(self.com_port_menu)
             frame.pack(fill=tk.X, padx=5, pady=2)
             ttk.Label(frame, text=f"{subsystem}:").pack(side=tk.LEFT)
@@ -235,44 +252,49 @@ def create_com_port_frame(self, parent_frame):
             dropdown.pack(side=tk.RIGHT)
             self.port_dropdowns[subsystem] = dropdown
 
-        ttk.Button(self.com_port_menu, text="Apply", command=self.apply_com_port_changes).pack(pady=5)
-
-    def toggle_com_port_menu(self):
-        if self.com_port_menu.winfo_viewable():
-            self.com_port_menu.pack_forget()
-            self.com_port_button.config(text="Configure COM Ports")
-        else:
-            self.update_available_ports() 
-            self.com_port_menu.pack(after=self.com_port_button, fill=tk.X, expand=True)
-            self.com_port_button.config(text="Hide COM Port Configuration")
-
-    def update_available_ports(self):
-        available_ports = [port.device for port in serial.tools.list_ports.comports()]
-        for dropdown in self.port_dropdowns.values():
-            current_value = dropdown.get()
-            dropdown['values'] = available_ports
-            if current_value in available_ports:
-                dropdown.set(current_value)
-            elif available_ports:
-                dropdown.set(available_ports[0])
-            else:
-                dropdown.set('')
-
-    def apply_com_port_changes(self):
-        new_com_ports = {subsystem: var.get() for subsystem, var in self.port_selections.items()}
-        self.update_com_ports(new_com_ports)
-        self.toggle_com_port_menu()
-
-    def update_com_ports(self, new_com_ports):
-        self.com_ports = new_com_ports
-        # TODO: update the COM ports for each subsystem
-
-        for subsystem_name, subsystem in self.subsystems.items():
-            if hasattr(subsystem, 'update_com_port'):
-                if subsystem_name == 'Vacuum System':
-                    subsystem.update_com_port(new_com_ports.get('VTRXSubsystem'))
-                elif subsystem_name == 'Cathode Heating':
-                    subsystem.update_com_ports(new_com_ports)
-            else:
-                self.logger.warning(f"Subsystem {subsystem_name} does not have an update_com_port method")
+
+    def _check_for_port_changes(self):
+        """
+        Compares the current available comports to the last set
+
+        Finally:
+            Calls itself to be cheack again
+        """
+        nowPorts = set(serial.tools.list_ports.comports())
+
+        dif = self.set_com_ports - nowPorts
+        added_ports = nowPorts - self.set_com_ports
+
+        try:
+            # Process removed ports
+            for port in dif:
+                if port.serial_number in self.PORT_INFO:
+                    self.logger.warning(f"Lost connection to {self.PORT_INFO[port.serial_number]} on {port}")
+                    self._update_com_ports(self.PORT_INFO[port.serial_number], None)
+
+            # Process added ports
+            for port in added_ports:
+                if port.serial_number in self.PORT_INFO:
+                    self.logger.info(f"Attempting to connect {self.PORT_INFO[port.serial_number]} to {port}")
+                    self._update_com_ports(self.PORT_INFO[port.serial_number], port)
+        except Exception as e:
+            self.logger.warning(f"Error was thrown when either removing or adding a comport: {e}")
+
+        finally:
+            self.set_com_ports = nowPorts
+            self.root.after(500, self._check_for_port_changes)
+
+    def _update_com_ports(self, subsystem, port):
+        """
+        Calls to update subsystems with change in comport
+        """
+        if subsystem == None:
+            raise ValueError("_update_com_ports was called with invalid args")
+        strPort = port.device if port != None else None
+        if subsystem in self.subsystems.keys():
+            if subsystem == "Interlocks":
+                self.subsystems[subsystem].update_com_port(strPort)
+            #TODO: Need to add Vacuum system and Cathode Heating
+
         self.logger.info(f"COM ports updated: {self.com_ports}")
+