Address device connection issues with RayNeo and VITURE, v2.0.10

Author: wheaney

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(xrDriver VERSION 2.0.9 LANGUAGES C)
+project(xrDriver VERSION 2.0.10 LANGUAGES C)
 
 configure_file(include/version.h.in version.h)
 include_directories(${PROJECT_BINARY_DIR})

docker-build/Dockerfile

@@ -3,7 +3,7 @@
 #    docker run --rm -t -v ./:/source -v --platform linux/amd64 "xr-driver:amd64"
 #    docker run --rm -t -v ./:/source -v --platform linux/arm64 "xr-driver:arm64"
 
-FROM --platform=$TARGETPLATFORM debian:latest
+FROM --platform=$TARGETPLATFORM debian:stable-20250428-slim
 
 ARG TARGETPLATFORM
 RUN echo "Target platform: $TARGETPLATFORM"

src/devices/rayneo.c

@@ -132,7 +132,9 @@ static void rayneo_mcu_callback(uint32_t state, uint64_t timestamp, size_t lengt
     }
 }
 
+static pthread_mutex_t device_connection_mutex = PTHREAD_MUTEX_INITIALIZER;
 bool rayneo_device_connect() {
+    pthread_mutex_lock(&device_connection_mutex);
     if (!soft_connected) {
         if (!hard_connected) {
             RegisterIMUEventCallback(rayneo_imu_callback);
@@ -145,20 +147,22 @@ bool rayneo_device_connect() {
         if (hard_connected) {
             StartXR();
             OpenIMU();
+            
+            soft_connected = true;
 
             // this will trigger the STATE_EVENT_DEVICE_INFO event
             AcquireDeviceInfo();
-
-            soft_connected = true;
         } else {
             log_message("RayNeo driver, failed to establish a connection\n");
         }
     }
+    pthread_mutex_unlock(&device_connection_mutex);
 
     return soft_connected;
 };
 
 void rayneo_device_disconnect(bool soft, bool is_device_present) {
+    pthread_mutex_lock(&device_connection_mutex);
     if (soft_connected) {
         CloseIMU();
         StopXR();
@@ -175,6 +179,7 @@ void rayneo_device_disconnect(bool soft, bool is_device_present) {
         free_and_clear(&device_model);
         hard_connected = false;
     }
+    pthread_mutex_unlock(&device_connection_mutex);
 };
 
 device_properties_type* rayneo_supported_device(uint16_t vendor_id, uint16_t product_id, uint8_t usb_bus, uint8_t usb_address) {
@@ -215,7 +220,7 @@ void rayneo_block_on_device() {
         sleep(1);
     }
 
-    if (soft_connected) rayneo_device_disconnect(false, device != NULL);
+    rayneo_device_disconnect(true, device != NULL);
     device_checkin(device);
 };
 
@@ -238,8 +243,8 @@ bool rayneo_is_connected() {
     return soft_connected;
 };
 
-void rayneo_disconnect(bool forced) {
-    rayneo_device_disconnect(forced, device_present());
+void rayneo_disconnect(bool soft) {
+    rayneo_device_disconnect(soft, device_present());
 };
 
 const device_driver_type rayneo_driver = {

src/devices/viture.c

@@ -152,17 +152,20 @@ device_properties_type* viture_supported_device(uint16_t vendor_id, uint16_t pro
     return NULL;
 };
 
+static pthread_mutex_t viture_connection_mutex = PTHREAD_MUTEX_INITIALIZER;
 static void disconnect(bool soft) {
+    pthread_mutex_lock(&viture_connection_mutex);
     if (connected) {
         set_imu(false);
-
-        // VITURE SDK freezes if we attempt deinit() while it's still physically connected, so only do this if the device is no longer present
-        if (!soft || !device_present()) {
-            deinit();
-            initialized = false;
-        }
         connected = false;
     }
+
+    // VITURE SDK freezes if we attempt deinit() while it's still physically connected, so only do this if the device is no longer present
+    if (initialized && (!soft || !device_present())) {
+        deinit();
+        initialized = false;
+    }
+    pthread_mutex_unlock(&viture_connection_mutex);
 }
 
 bool viture_device_connect() {
@@ -216,7 +219,7 @@ void viture_block_on_device() {
             imu_state = get_imu_state();
         }
     }
-    disconnect(false);
+    disconnect(true);
     device_checkin(device);
 };
 

src/driver.c

@@ -311,8 +311,8 @@ void update_config_from_file(FILE *fp) {
 
     update_config(config(), new_config);
 
-    if (driver_newly_disabled && is_driver_connected()) {
-        if (new_config->debug_device) log_debug("update_config_from_file, device_driver->disconnect_func(true)\n");
+    if (config()->disabled && is_driver_connected()) {
+        if (config()->debug_device) log_debug("update_config_from_file, device_driver->disconnect_func(true)\n");
         device_driver->disconnect_func(true);
     }
 

src/plugins/smooth_follow.c

@@ -211,7 +211,7 @@ void smooth_follow_set_config_func(void* config) {
 
         if (temp_config->sideview_enabled && 
                 sf_config->sideview_follow_enabled != temp_config->sideview_follow_enabled ||
-            sf_config->sideview_enabled != temp_config->sideview_enabled)
+            sf_config->sideview_enabled != temp_config->sideview_enabled && temp_config->sideview_follow_enabled)
             log_message("Sideview follow has been %s\n", temp_config->sideview_follow_enabled ? "enabled" : "disabled");
 
         if (temp_config->sideview_follow_threshold != sf_config->sideview_follow_threshold)