Merge branch 'main' into LordOfDragons-vivefacialtracker

Author: dfgHiatus

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Babble-Unity-Demo"]
+	path = Babble-Unity-Demo
+	url = https://github.com/dfgHiatus/Babble-Unity-Demo

Babble-Unity-Demo

@@ -44,6 +44,7 @@
         winmm = windll.winmm
     except OSError:
         print(f'\033[91m[{lang._instance.get_string("log.error")}] {lang._instance.get_string("error.winmm")}.\033[0m')
+        
 os.system("color")  # init ANSI color
 
 # Random environment variable to speed up webcam opening on the MSMF backend.

BabbleApp/babbleapp.py

@@ -28,7 +28,7 @@
 #  packet (packet-size bytes)
 ETVR_HEADER = b"\xff\xa0\xff\xa1"
 ETVR_HEADER_LEN = 6
-PORTS = ("COM", "/dev/tty")
+PORTS = ("COM", "/dev/ttyACM")
 
 
 class CameraState(Enum):
@@ -323,18 +323,20 @@ def start_serial_connection(self, port):
         try:
             rate = 115200 if sys.platform == "darwin" else 3000000  # Higher baud rate not working on macOS
             conn = serial.Serial(baudrate=rate, port=port, xonxoff=False, dsrdtr=False, rtscts=False)
-            # Set explicit buffer size for serial.
-            conn.set_buffer_size(rx_size=BUFFER_SIZE, tx_size=BUFFER_SIZE)
+            # Set explicit buffer size for serial. This function is Windows only!
+            if is_nt:
+                conn.set_buffer_size(rx_size=BUFFER_SIZE, tx_size=BUFFER_SIZE)
 
             print(
                 f'{Fore.CYAN}[{lang._instance.get_string("log.info")}] {lang._instance.get_string("info.ETVRConnected")} {port}{Fore.RESET}'
             )
             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.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:
@@ -341,7 +341,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 = (

BabbleApp/camera_widget.py

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Check if running on a supported operating system
+if [[ "$OSTYPE" != "linux-gnu"* ]] && [[ "$OSTYPE" != "darwin"* ]]; then    
+    echo "Error: This script is only compatible with Linux and macOS operating systems."    
+    exit 1
+fi
+
+# Check Python version
+if ! command -v python3 &> /dev/null; then    
+    echo "Error: Python is not installed. Please install Python 3.8 or higher."    
+    exit 1
+fi  
+    
+python_version_major=$(python3 -c 'import platform; print(platform.python_version_tuple()[0])')
+python_version_minor=$(python3 -c 'import platform; print(platform.python_version_tuple()[1])')
+if (( python_version_major < 3 || python_version_minor < 8 )); then    
+    echo "Error: Your Python version is too low! Please install 3.8 or higher."    
+    exit 1
+fi
+
+install_dir="$HOME/.local/share/project-babble"
+bin_dir="$HOME/.local/bin"
+
+# Create installation directory if it doesn't exist
+mkdir -p "$install_dir"
+
+# Function to install requirements
+install_requirements() {
+    cd "$install_dir"
+    cd BabbleApp
+    echo "Installing requirements..."
+    # Create a temporary requirements file without the Windows-only package
+    grep -v "onnxruntime-directml" requirements.txt > unix_requirements.txt
+    pip install -r unix_requirements.txt --quiet
+    rm unix_requirements.txt
+}
+
+# Function to get the latest commit hash
+get_latest_commit() {
+    git fetch origin main
+    git rev-parse origin/main
+}
+
+# Function to get the current commit hash
+get_current_commit() {
+    git rev-parse HEAD
+}
+
+# Function to update the repository
+update_repo() {
+    echo "Checking for updates..."
+    git fetch origin main
+    local_commit=$(get_current_commit)
+    remote_commit=$(get_latest_commit)
+    
+    if [ "$local_commit" != "$remote_commit" ]; then
+        echo "New version available"
+        echo "Current commit: ${local_commit:0:8}"
+        echo "Latest commit: ${remote_commit:0:8}"
+        echo "Updating to the latest version..."
+        git checkout main
+        git pull origin main
+        echo "Updating dependencies..."
+        source venv/bin/activate
+        install_requirements
+        deactivate
+        echo "Project Babble has been updated successfully to commit ${remote_commit:0:8}!"
+    else
+        echo "Project Babble is already at the latest commit: ${local_commit:0:8}"
+    fi
+}
+
+# Ensure we're in the correct directory
+cd "$install_dir"
+cd BabbleApp
+
+# Create venv if it does not exist
+if ! [ -d "venv" ]; then
+    python3 -m venv venv
+fi
+
+# Use the correct activation script based on OS
+source venv/bin/activate
+update_repo
+echo "Verifying dependencies. This might take a second!"
+install_requirements
+echo "Starting Babble app..."
+python3 babbleapp.py

README.md

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Check if running on Linux
-if [[ "$OSTYPE" != "linux-gnu"* ]]; then    
-    echo "Error: This script is only compatible with Linux operating systems."    
+# Check if running on a supported operating system
+if [[ "$OSTYPE" != "linux-gnu"* ]] && [[ "$OSTYPE" != "darwin"* ]]; then    
+    echo "Error: This script is only compatible with Linux and macOS operating systems."    
     exit 1
 fi
 
@@ -19,12 +19,15 @@ if (( python_version_major < 3 || python_version_minor < 8 )); then
     exit 1
 fi
 
-# Set installation directory
 install_dir="$HOME/.local/share/project-babble"
+bin_dir="$HOME/.local/bin"
+
+# Create installation directory if it doesn't exist
+mkdir -p "$install_dir"
 
 # Function to install requirements
 install_requirements() {
-    cd $install_dir
+    cd "$install_dir"
     cd BabbleApp
     echo "Installing requirements..."
     # Create a temporary requirements file without the Windows-only package
@@ -62,7 +65,7 @@ update_repo() {
 }
 
 
-cd $install_dir
+cd "$install_dir"
 cd BabbleApp
 
 # Create venv if it does not exists