Fix UVC Camera's not changing + List COM ports

Author: RamesTheGeneric

BabbleApp/camera.py

@@ -87,9 +87,7 @@ def run(self):
             if (
                     self.config.capture_source is not None and self.config.capture_source != ""
             ):
-                self.current_capture_source = self.config.capture_source
-
-                if "COM" in str(self.config.capture_source) and self.config.capture_source not in self.camera_list:
+                if "COM" in str(self.config.capture_source):
                     if (
                             self.serial_connection is None
                             or self.camera_status == CameraState.DISCONNECTED
@@ -114,7 +112,7 @@ def run(self):
                         if self.config.capture_source not in self.camera_list:
                             self.current_capture_source = self.config.capture_source
                         else:
-                            self.current_capture_source = get_camera_index_by_name(self.current_capture_source)
+                            self.current_capture_source = get_camera_index_by_name(self.config.capture_source)
 
                         if self.config.use_ffmpeg:
                             self.cv2_camera = cv2.VideoCapture(self.current_capture_source, cv2.CAP_FFMPEG)
@@ -139,7 +137,8 @@ def run(self):
             if should_push and not self.capture_event.wait(timeout=0.02):
                 continue
             if self.config.capture_source is not None:
-                if "COM" in str(self.config.capture_source):
+                ports = ("COM", "/dev/tty")
+                if any(x in str(self.config.capture_source) for x in ports):
                     self.get_serial_camera_picture(should_push)
                 else:
                     self.get_cv2_camera_picture(should_push)

BabbleApp/camera_widget.py

@@ -10,7 +10,7 @@
 from config import BabbleConfig
 from landmark_processor import LandmarkProcessor
 from osc import Tab
-from utils.misc_utils import PlaySound, SND_FILENAME, SND_ASYNC, list_camera_names
+from utils.misc_utils import PlaySound, SND_FILENAME, SND_ASYNC, list_camera_names, get_camera_index_by_name
 
 
 class CameraWidget:
@@ -245,9 +245,13 @@ def render(self, window, event, values):
                 self.config.use_ffmpeg = False
                 # Try storing ints as ints, for those using wired cameras.
                 if value not in self.camera_list:
-                    self.config.capture_source = int(value)
-                else:
                     self.config.capture_source = value
+                else:
+                    #if "COM" not in value:
+                    ports = ("COM", "/dev/tty")
+                    if any(x in str(self.config.capture_source) for x in ports):
+                        self.config.capture_source = get_camera_index_by_name(value)
+                    else: self.config.capture_source = value
             except ValueError:
                 if value == "":
                     self.config.capture_source = None

BabbleApp/utils/misc_utils.py

@@ -1,8 +1,10 @@
-import os
 import typing
+import serial
+import sys
+import glob
 from pygrabber.dshow_graph import FilterGraph
 
-is_nt = True if os.name == "nt" else False
+is_nt = True if sys.platform.startswith('win') else False
 graph = FilterGraph()
 
 
@@ -11,18 +13,54 @@ def list_camera_names():
     cam_names = []
     for index, name in enumerate(cam_list):
         cam_names.append(name)
+    cam_names = cam_names + list_serial_ports()
     return cam_names
 
+def list_serial_ports():
+    """ Lists serial port names
+
+        :raises EnvironmentError:
+            On unsupported or unknown platforms
+        :returns:
+            A list of the serial ports available on the system
+    """
+    if sys.platform.startswith('win'):
+        ports = ['COM%s' % (i + 1) for i in range(256)]
+    elif sys.platform.startswith('linux') or sys.platform.startswith('cygwin'):
+        # this excludes your current terminal "/dev/tty"
+        ports = glob.glob('/dev/tty[A-Za-z]*')
+    elif sys.platform.startswith('darwin'):
+        ports = glob.glob('/dev/tty.*')
+    else:
+        raise EnvironmentError('Unsupported platform')
+
+    result = []
+    for port in ports:
+        try:
+            s = serial.Serial(port)
+            s.close()
+            result.append(port)
+        except (OSError, serial.SerialException):
+            pass
+    return result
+
 
 def get_camera_index_by_name(name):
+    #cam_list = list_camera_names()
     cam_list = graph.get_input_devices()
+    #rint(f"name: {name}")
+    #rint(f"cam_list: {cam_list}")
 
     for i, device_name in enumerate(cam_list):
         if device_name == name:
             return i
 
     return None
 
+#def get_serial_port(name):
+#    for i, device in enumerate(cam_list):
+
+
 
 def PlaySound(*args, **kwargs): pass