Merge pull request #85 from RamesTheGeneric/main

Fix serial connection on Linux

Author: dfgHiatus

BabbleApp/camera.py

@@ -10,7 +10,7 @@
 
 from colorama import Fore
 from config import BabbleConfig, BabbleSettingsConfig
-from utils.misc_utils import is_nt, get_camera_index_by_name, list_camera_names
+from utils.misc_utils import get_camera_index_by_name, list_camera_names, is_nt
 from enum import Enum
 import sys
 
@@ -86,8 +86,8 @@ def run(self):
                 self.config.capture_source is not None
                 and self.config.capture_source != ""
             ):
-                capture = str(self.config.capture_source)
-                if "COM" in capture or "/dev/tty" in capture:
+                ports = ("COM", "/dev/ttyACM")
+                if any(x in str(self.config.capture_source) for x in ports):
                     if (
                         self.serial_connection is None
                         or self.camera_status == CameraState.DISCONNECTED
@@ -151,7 +151,7 @@ def run(self):
             if should_push and not self.capture_event.wait(timeout=0.02):
                 continue
             if self.config.capture_source is not None:
-                ports = ("COM", "/dev/tty")
+                ports = ("COM", "/dev/ttyACM")
                 if any(x in str(self.config.capture_source) for x in ports):
                     self.get_serial_camera_picture(should_push)
                 else:
@@ -275,10 +275,11 @@ def start_serial_connection(self, port):
             )
             self.serial_connection = conn
             self.camera_status = CameraState.CONNECTED
-        except Exception:
+        except Exception as e:
             print(
                 f'{Fore.CYAN}[{lang._instance.get_string("log.info")}] {lang._instance.get_string("info.ETVRFailiure")} {port}{Fore.RESET}'
             )
+            print(e)
             self.camera_status = CameraState.DISCONNECTED
 
     def clamp_max_res(self, image: MatLike) -> MatLike:

BabbleApp/camera_widget.py

@@ -319,7 +319,7 @@ def render(self, window, event, values):
                 # if value not in self.camera_list:
                 #    self.config.capture_source = value
                 # if "COM" not in value:
-                ports = ("COM", "/dev/tty")
+                ports = ("COM", "/dev/ttyACM")
                 if any(x in str(value) for x in ports):
                     self.config.capture_source = value
                 else:
@@ -344,7 +344,7 @@ def render(self, window, event, values):
                         and ".mp4" not in value
                         and "udp" not in value
                         and "COM" not in value
-                        and "/dev/tty" not in value
+                        and "/dev/ttyACM" not in value
                         and value not in self.camera_list
                     ):  # If http is not in camera address, add it.
                         self.config.capture_source = (