diff --git a/GazeWebSocketServer.sln b/GazeWebSocketServer.sln
index b754b70..4b1ccaf 100644
--- a/GazeWebSocketServer.sln
+++ b/GazeWebSocketServer.sln
@@ -11,16 +11,21 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
+ Tracker|Any CPU = Tracker|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Tracker|Any CPU.ActiveCfg = Tracker|Any CPU
+ {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Tracker|Any CPU.Build.0 = Tracker|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Tracker|Any CPU.ActiveCfg = Release|Any CPU
+ {64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Tracker|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/GazeWebSocketServer/App.config b/GazeWebSocketServer/App.config
index 8b1af1f..6bcc981 100644
--- a/GazeWebSocketServer/App.config
+++ b/GazeWebSocketServer/App.config
@@ -1,13 +1,13 @@
-
+
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/GazeWebSocketServer/GazeWebSocketServer.csproj b/GazeWebSocketServer/GazeWebSocketServer.csproj
index d5600a9..4948539 100644
--- a/GazeWebSocketServer/GazeWebSocketServer.csproj
+++ b/GazeWebSocketServer/GazeWebSocketServer.csproj
@@ -34,12 +34,23 @@
prompt
4
+
+ true
+ bin\Tracker\
+ DEBUG;TRACE
+ full
+ x64
+ prompt
+ MinimumRecommendedRules.ruleset
+ true
+
+
diff --git a/GazeWebSocketServer/Program.cs b/GazeWebSocketServer/Program.cs
index a12ad77..fb12334 100644
--- a/GazeWebSocketServer/Program.cs
+++ b/GazeWebSocketServer/Program.cs
@@ -18,7 +18,7 @@ namespace GazeWebSocketServer
ConfigurationData.InitializeUnexistingWithDefaults();
ConfigurationData config = ConfigurationData.ParseToObject();
- if (args[0] == "-d")
+ if (args.Length > 0 && args[0] == "-d")
{
Task.Run(() => SimulateGazeData(300));
}
@@ -55,7 +55,6 @@ namespace GazeWebSocketServer
private static void OnGazeDataAvailable(TobiiEyeTracker sender, GazeData data)
{
- Console.WriteLine(data);
if (gazeServer != null && gazeServer.isRunning)
{
gazeServer.Publish(data);
@@ -69,7 +68,7 @@ namespace GazeWebSocketServer
private static void OnConnectionEstablished(TobiiEyeTracker sender)
{
- Console.WriteLine($"Tracker {sender.ToString()} connected.");
+ Console.WriteLine($"Tracker {sender.SerialNumber} connected.");
ConfigurationData config = ConfigurationData.ParseToObject();
sender.SetTrackingFrequency(config.TrackerFrequency);
}
diff --git a/TrackerBridge/TobiiEyeTracker.cs b/TrackerBridge/TobiiEyeTracker.cs
index e7fe5c9..c7cf92b 100644
--- a/TrackerBridge/TobiiEyeTracker.cs
+++ b/TrackerBridge/TobiiEyeTracker.cs
@@ -16,6 +16,7 @@ namespace TrackerBridge
public event GazeDataHandler GazeDataAvailable;
public Boolean IsConnected { get; private set; }
+ public String SerialNumber { get => serialNumber; }
private IEyeTracker eyeTracker = null;
private String serialNumber = null;
@@ -93,6 +94,7 @@ namespace TrackerBridge
}
}
eyeTracker.GazeDataReceived += OnGazeDataReceived;
+ serialNumber = eyeTracker.SerialNumber;
SetTrackingFrequency(600f);
ConnectionEvent?.Invoke(this);
}