corrected text formatting and html monitor template

Author: davidson-engineering

html_monitor_example.py

@@ -15,21 +15,36 @@
 # Initialize SocketManager with Flask-SocketIO instance
 manager = SocketManager(socketio=socketio, frequency=20)  # 20Hz update rate
 
-text_format = TextFormat(width=6, precision=3, force_sign=True)
+text_format = TextFormat(width=9, precision=3, force_sign=True)
+
+data_formats = {
+    "position_x": text_format,
+    "position_y": text_format,
+    "position_z": text_format,
+    "motor1_speed": None,
+    "motor1_torque": None,
+    "motor1_status": None,
+    "motor2_speed": None,
+    "motor2_torque": None,
+    "motor2_status": None,
+    "motor3_speed": None,
+    "motor3_torque": None,
+    "motor3_status": None,
+    "motor4_speed": None,
+    "motor4_torque": None,
+    "motor4_status": None,
+}
 # Define and add elements to the manager
-text_element1 = TextElement(element_id="element1", text_format=text_format)
-text_element2 = TextElement(element_id="element2", text_format=text_format)
-text_element3 = TextElement(element_id="element3", text_format=text_format)
-manager.add_element(text_element1)
-manager.add_element(text_element2)
-manager.add_element(text_element3)
+for name, format in data_formats.items():
+    text_element = TextElement(element_id=name, text_format=format)
+    manager.add_element(text_element)
 
 # Set up the Serial Update Server
 server = SerialUpdateServer(
     manager,
-    port="/dev/tty.usbserial-1460",
+    detect_devices=True,
     baudrate=115200,
-    decoder=OrderedDecoder(keys=["element1", "element2", "element3"]),
+    decoder=OrderedDecoder(keys=data_formats.keys()),
 )
 
 

src/app_monitor/elements_base.py

@@ -133,10 +133,12 @@ def display(self):
             self.text_format.format_text(full_text) if self.text_format else full_text
         )
 
-        # Format the text with padding
-        padded_text = full_text.ljust(self.width)
+        return full_text
 
-        return self.add_border(padded_text)
+        # # Format the text with padding
+        # padded_text = full_text.ljust(self.width)
+
+        # return self.add_border(padded_text)
 
     def get_height(self):
         """Calculate the number of lines the text element occupies."""

src/app_monitor/server.py

@@ -59,6 +59,7 @@ class SerialUpdateServer(UpdateServer):
     def __init__(
         self,
         monitor_manager,
+        detect_devices=False,
         serial_instance=None,
         port="/dev/ttyUSB0",
         baudrate=9600,
@@ -67,13 +68,41 @@ def __init__(
         super().__init__(monitor_manager)
         if serial_instance:
             self.serial_connection = serial_instance
-            self.port = serial_instance.port
-            self.baudrate = serial_instance.baudrate
+        elif detect_devices:
+            self.serial_connection = self.detect_devices(baudrate=baudrate)
         else:
             self.serial_connection = serial.Serial(port=port, baudrate=baudrate)
-            self.port = port
-            self.baudrate = baudrate
-            self.decoder = decoder
+
+        self.port = self.serial_connection.port
+        self.baudrate = self.serial_connection.baudrate
+        self.decoder = decoder
+
+    def detect_devices(
+        self,
+        search: str = r"usb",
+        pattern: str = "/dev/tty*",
+        baudrate=9600,
+    ):
+
+        def find_devices(search, pattern):
+            import glob
+            import re
+
+            # List all files matching the pattern /dev/tty*
+            files = glob.glob(pattern)
+
+            # Filter files that contain 'usb'
+            devices = [f for f in files if re.search(search, f)]
+
+            return devices
+
+        if devices := find_devices(search, pattern):
+            for device in devices:
+                try:
+                    serial_device = serial.Serial(port=device, baudrate=baudrate)
+                    return serial_device
+                except Exception as e:
+                    logger.error(f"Error connecting to {device}: {e}")
 
     async def start(self, frequency: float = 30):
         """Start the serial reader asynchronously by polling the serial port."""

src/app_monitor/text_formatter.py

@@ -42,22 +42,21 @@ def __init__(self, text, width=None, precision=None, force_sign=False):
         self.force_sign = force_sign
 
     def format_text(self):
-        # Format the number if width, precision, or force_sign is specified
+        # Try to convert text to a float if it's a string
         if isinstance(self.text, str):
             try:
                 self.text = float(self.text)
             except ValueError:
-                return self.text
+                return self.text  # Return original text if it can't be converted
+
+        # If the text is a number, format it accordingly
         if isinstance(self.text, (int, float)):
-            # Build the format specification string
+            # Determine the sign based on force_sign
             sign = "+" if self.force_sign else ""
-            format_spec = (
-                f"{sign}{self.width}.{self.precision}f"
-                if self.precision is not None
-                else f"{self.width}f"
-            )
-            # Format the text according to the specification
-            return f"{float(self.text):{format_spec}}"
+            # Build the format specification string
+            format_spec = f"{sign}0{self.width}.{self.precision}f"
+            # Format the number according to the specification
+            return f"{self.text:{format_spec}}"
         else:
             # If it's not a number, return as-is
             return str(self.text)