diff --git a/GazeWebSocketServer.sln b/GazeWebSocketServer.sln
index c429ceb..a7bf78c 100644
--- a/GazeWebSocketServer.sln
+++ b/GazeWebSocketServer.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GazeWebSocketServer", "Gaze
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackerBridge", "TrackerBridge\TrackerBridge.csproj", "{64D52257-ECA7-4F4D-A901-B14D544A1D0A}"
EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiSetup", "MsiSetup\MsiSetup.wixproj", "{5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}"
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiSetup", "MsiSetup\MsiSetup.wixproj", "{BCC5CAB0-AE84-4137-9BA0-77D311D3D271}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,8 +17,8 @@ Global
Release|x86 = Release|x86
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}.Debug|Any CPU.ActiveCfg = Tracker|Any CPU
+ {F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|Any CPU.Build.0 = Tracker|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|x86.ActiveCfg = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Debug|x86.Build.0 = Debug|Any CPU
{F8F11E64-7946-4054-8C27-F0FCAF967F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,12 +33,12 @@ Global
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|Any CPU.Build.0 = Release|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|x86.ActiveCfg = Release|Any CPU
{64D52257-ECA7-4F4D-A901-B14D544A1D0A}.Release|x86.Build.0 = Release|Any CPU
- {5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|Any CPU.ActiveCfg = Debug|x86
- {5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|x86.ActiveCfg = Debug|x86
- {5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Debug|x86.Build.0 = Debug|x86
- {5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|Any CPU.ActiveCfg = Release|x86
- {5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|x86.ActiveCfg = Release|x86
- {5A80ED30-7CA5-4A10-B2AB-7B3FE10FF56B}.Release|x86.Build.0 = Release|x86
+ {BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Debug|x86.ActiveCfg = Debug|x86
+ {BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Debug|x86.Build.0 = Debug|x86
+ {BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Release|Any CPU.ActiveCfg = Release|x86
+ {BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Release|x86.ActiveCfg = Release|x86
+ {BCC5CAB0-AE84-4137-9BA0-77D311D3D271}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/GazeWebSocketServer/GazeWebSocketServer.csproj b/GazeWebSocketServer/GazeWebSocketServer.csproj
index a283c99..f96fdbc 100644
--- a/GazeWebSocketServer/GazeWebSocketServer.csproj
+++ b/GazeWebSocketServer/GazeWebSocketServer.csproj
@@ -31,7 +31,7 @@
true
- x64
+ x86
true
full
false
@@ -41,21 +41,21 @@
4
- x64
+ x86
pdbonly
true
bin\Release\
TRACE
prompt
4
- false
+ true
true
bin\Tracker\
DEBUG;TRACE
full
- x64
+ x86
prompt
MinimumRecommendedRules.ruleset
true
@@ -71,9 +71,6 @@
-
- ..\packages\Tobii.Research.x64.1.7.0.1070\lib\net452\Tobii.Research.dll
-
..\packages\WebSocketSharp.1.0.3-rc11\lib\websocket-sharp.dll
@@ -109,11 +106,4 @@
-
-
-
- Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".
-
-
-
\ No newline at end of file
diff --git a/GazeWebSocketServer/packages.config b/GazeWebSocketServer/packages.config
index cd7605b..6b8ef26 100644
--- a/GazeWebSocketServer/packages.config
+++ b/GazeWebSocketServer/packages.config
@@ -1,5 +1,4 @@
-
\ No newline at end of file
diff --git a/MsiSetup/MsiSetup.wixproj b/MsiSetup/MsiSetup.wixproj
index a23fa4e..355d11d 100644
--- a/MsiSetup/MsiSetup.wixproj
+++ b/MsiSetup/MsiSetup.wixproj
@@ -4,7 +4,7 @@
Debug
x86
3.10
- 5a80ed30-7ca5-4a10-b2ab-7b3fe10ff56b
+ bcc5cab0-ae84-4137-9ba0-77d311d3d271
2.0
GazeWSS
Package
diff --git a/MsiSetup/Product.wxs b/MsiSetup/Product.wxs
index ddf1980..2c3a218 100644
--- a/MsiSetup/Product.wxs
+++ b/MsiSetup/Product.wxs
@@ -1,27 +1,27 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -33,27 +33,33 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
diff --git a/TrackerBridge/TobiiEyeTracker.cs b/TrackerBridge/TobiiEyeTracker.cs
index 9c22721..c122b2c 100644
--- a/TrackerBridge/TobiiEyeTracker.cs
+++ b/TrackerBridge/TobiiEyeTracker.cs
@@ -59,8 +59,7 @@ namespace TrackerBridge
public void Connect()
{
- Task task = new Task(() => InitiateConnection());
- task.Start();
+ Task.Run(() => InitiateConnection());
}
private void InitiateConnection()
{
@@ -68,6 +67,8 @@ namespace TrackerBridge
while (eyeTracker == null)
{
EyeTrackerCollection eyeTrackers = EyeTrackingOperations.FindAllEyeTrackers();
+ Console.WriteLine("Searching for Tobii eye trackers");
+
if (eyeTrackers.Count > 0)
{
if (SerialNumber == null)
diff --git a/TrackerBridge/TrackerBridge.csproj b/TrackerBridge/TrackerBridge.csproj
index 8a44d5d..8663007 100644
--- a/TrackerBridge/TrackerBridge.csproj
+++ b/TrackerBridge/TrackerBridge.csproj
@@ -23,7 +23,7 @@
DEBUG;TRACE
prompt
4
- x64
+ x86
pdbonly
@@ -32,7 +32,7 @@
TRACE
prompt
4
- x64
+ x86
@@ -47,7 +47,7 @@
- ..\packages\Tobii.Research.x64.1.7.0.1070\lib\net452\Tobii.Research.dll
+ ..\packages\Tobii.Research.x86.1.7.0.1070\lib\net452\Tobii.Research.dll
@@ -64,11 +64,11 @@
-
+
Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".
-
+
\ No newline at end of file
diff --git a/TrackerBridge/packages.config b/TrackerBridge/packages.config
index 03fedc7..77541ce 100644
--- a/TrackerBridge/packages.config
+++ b/TrackerBridge/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file