From 26455e3b0ca43a2000e0807b3ccfc81e99828348 Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Mon, 17 Oct 2022 14:47:48 +0200
Subject: Using tobii auto discovery features.

---
 src/argaze/utils/tobii_stream_aruco_aoi_display.py | 14 ++++++++++++--
 src/argaze/utils/tobii_stream_display.py           | 16 +++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/argaze/utils/tobii_stream_aruco_aoi_display.py b/src/argaze/utils/tobii_stream_aruco_aoi_display.py
index 5e2b78c..0ded26f 100644
--- a/src/argaze/utils/tobii_stream_aruco_aoi_display.py
+++ b/src/argaze/utils/tobii_stream_aruco_aoi_display.py
@@ -35,9 +35,19 @@ def main():
         print(f'Track any Aruco markers from the {args.marker_dictionary} dictionary')
     else:
         print(f'Track Aruco markers {list(args.marker_id_scene.keys())} from the {args.marker_dictionary} dictionary')
+    
+    # Create tobii controller (with auto discovery network process if no ip argument is provided)
+    print("Looking for a Tobii Glasses Pro 2 device ...")
+
+    try:
+
+        tobii_controller = TobiiController.TobiiController(args.tobii_ip)
+        print(f'Tobii Glasses Pro 2 device found at {tobii_controller.address} address.')
+
+    except ConnectionError as e:
 
-    # Create tobii controller
-    tobii_controller = TobiiController.TobiiController(args.tobii_ip, 'myProject', 'mySelf')
+        print(e)
+        exit()
 
     # Enable tobii data stream 
     tobii_data_stream = tobii_controller.enable_data_stream()
diff --git a/src/argaze/utils/tobii_stream_display.py b/src/argaze/utils/tobii_stream_display.py
index 68a2d71..09360ef 100644
--- a/src/argaze/utils/tobii_stream_display.py
+++ b/src/argaze/utils/tobii_stream_display.py
@@ -16,12 +16,22 @@ def main():
 
     # Manage arguments
     parser = argparse.ArgumentParser(description=main.__doc__.split('-')[0])
-    parser.add_argument('-t', '--tobii_ip', metavar='TOBII_IP', type=str, default='10.34.0.12', help='tobii glasses ip')
+    parser.add_argument('-t', '--tobii_ip', metavar='TOBII_IP', type=str, default=None, help='tobii glasses ip')
 
     args = parser.parse_args()
 
-    # Create tobii controller
-    tobii_controller = TobiiController.TobiiController(args.tobii_ip, 'myProject', 'mySelf')
+    # Create tobii controller (with auto discovery network process if no ip argument is provided)
+    print("Looking for a Tobii Glasses Pro 2 device ...")
+
+    try:
+
+        tobii_controller = TobiiController.TobiiController(args.tobii_ip)
+        print(f'Tobii Glasses Pro 2 device found at {tobii_controller.address} address.')
+
+    except ConnectionError as e:
+
+        print(e)
+        exit()
 
     # Enable tobii data stream 
     tobii_data_stream = tobii_controller.enable_data_stream()
-- 
cgit v1.1