Merge pull request #148 from ISSUIUC/cleanup/midas-base-improvements

System-wide Feather Duo software improvements (MIDAS-BASE)

Author: mpkarpov-ui

ground/gss_combiner/README.md

@@ -0,0 +1,9 @@
+# Ground Station Data Ingestion
+
+Something more will be written here later, for now:
+
+```pip install -r requirements.txt```
+and then
+```python gui_main.py```
+
+to run MIDAS-Base

ground/gss_combiner/gui_main.py

@@ -29,7 +29,7 @@ def is_port_taken(port):
         bool: True if the port is taken, False otherwise.
     """
     try:
-        ser = serial.Serial(port)
+        ser = serial.Serial(port, write_timeout=1, timeout=2)
         return False, ser  # Port is free
     except serial.SerialException as e:
         return True, None
@@ -524,7 +524,10 @@ def perform_action(self):
             target_device.has_errored = False
             target_device.reset()
             target_device.stat = "STARTUP..."
-            target_device.meta = f"{self.stage_sel.get().upper()} (LOG: {"YES" if should_log else "NO"})"
+            log_str = "NO"
+            if should_log:
+                log_str = "YES"
+            target_device.meta = f"{self.stage_sel.get().upper()} (LOG: {log_str})"
             target_device.stage_sel = self.stage_sel.get()
             target_device.pipe_conn, child_conn = multiprocessing.Pipe()
             target_device.proc = multiprocessing.Process(target=run_standalone_worker, args=(child_conn, ip, self.selected_device, self.stage_sel.get(), should_log))
@@ -537,36 +540,6 @@ def inspect_window(self):
             self.open_terminal_window(self.selected_device)
             # Add real logic here
 
-    def show_json_window(self):
-        window = tk.Toplevel(self)
-
-        title = "Data"
-        json_data = {"hello": "world", "bruh": "moment"}
-        window.title(title)
-        window.geometry("600x400")
-
-        label = ttk.Label(window, text=title, font=("Helvetica", 14, "bold"))
-        label.pack(pady=5)
-
-        # Text widget with scrollbar
-        text_frame = ttk.Frame(window)
-        text_frame.pack(fill="both", expand=True, padx=10, pady=5)
-
-        scrollbar = ttk.Scrollbar(text_frame)
-        scrollbar.pack(side="right", fill="y")
-
-        text = tk.Text(text_frame, wrap="none", yscrollcommand=scrollbar.set, bg="#1e1e1e", fg="#d4d4d4", insertbackground="white")
-        text.pack(fill="both", expand=True)
-        scrollbar.config(command=text.yview)
-
-        # Pretty-print the JSON
-        pretty_json = json.dumps(json_data, indent=4)
-        text.insert("1.0", pretty_json)
-        text.config(state="disabled")  # Make it read-only
-
-        # Optional: allow closing with Esc
-        window.bind("<Escape>", lambda e: window.destroy())
-
     def open_terminal_window(self, device):
         global devices
         term_win = tk.Toplevel(self)
@@ -616,6 +589,7 @@ def send_command(event=None):
                 output.insert("end", f">> {command}\n", "user_in")
                 output.config(state="disabled")
                 output.see("end")
+                
                 target_device.pipe_conn.send(command + "\n")
                 input_var.set("")
 

ground/gss_combiner/requirements.txt

@@ -0,0 +1,2 @@
+pyserial
+paho-mqtt

ground/gss_combiner/standalone.py

@@ -7,13 +7,15 @@
 import threading
 import sys
 import queue
+import os
 
 import serial # PySerial
 import paho.mqtt.client as mqtt
 import time
 
 import argparse
 
+import re
 import util.logger
 
 stdin_q = queue.Queue()
@@ -35,6 +37,7 @@ def __init__(self, com_port, server_uri, stage, should_log) -> None:
         self.__outfile_raw = None
 
         if(self.__should_log):
+            os.makedirs("outputs", exist_ok=True)
             self.__outfile = open(f"./outputs/{time.time()}_log.telem", "w+")
             self.__outfile_raw = open(f"./outputs/{time.time()}_raw_log.txt", "w+")
 
@@ -102,6 +105,7 @@ def on_message(client, userdata, msg):
         self.__in_buf = ""
 
         self.__out_all = False
+        self.__filter = ".*"
 
 
     def process_packet(self, packet_json):
@@ -164,7 +168,9 @@ def run(self) -> None:
                 if len(packets) > 0:
                     if self.__out_all:
                         for p in packets:
-                            print(f"[F] {p.strip()}", flush=True)
+
+                            if re.findall(self.__filter, p.strip()):
+                                print(f"[F] {p.strip()}", flush=True)
 
                 # Process stdin
                 if not stdin_q.empty():
@@ -178,13 +184,38 @@ def run(self) -> None:
                         is_internal = True
                         print("[CMD] PONG", flush=True)
 
+                    if line.startswith("FILTER"):
+                        is_internal = True
+
                     if line == "OUT_ALL":
                         is_internal = True
                         self.__out_all = True
                         print("[CMD] OUT_ALL - Now outputting all serial data.")
                         print("Note: Serial data from the feather will be formatted like below:")
                         print("[F] This is a sample serial output.", flush=True)
 
+                    if line.startswith("FILTER "):
+                        f = line[7:]
+                        
+
+                        if not self.__out_all:
+                            print("[CMD] Automatically invoking OUT_ALL...")
+                            print("[CMD] OUT_ALL - Now outputting all serial data.")
+                            print("Note: Serial data from the feather will be formatted like below:")
+                            print("[F] This is a sample serial output.", flush=True)
+
+                        if f == "*":
+                            f = ".*"
+
+                        if f.lower() == "boo":
+                            f = "is_sustainer\": 0"
+
+                        if f.lower() == "sus":
+                            f = "is_sustainer\": 1"
+
+                        self.__filter = f
+                        print(f"[CMD] Filter set to {self.__filter}", flush=True)
+
                     if line == "OUT_DEFAULT":
                         is_internal = True
                         self.__out_all = False