Changed connect order

2015-10-20 00:27:21 +02:00
parent f0578091d8
commit 0522d43a19
3 changed files with 29 additions and 23 deletions
@@ -51,6 +51,35 @@ namespace ErgometerApplication
        {
            error = "Succes";

+            if (!ComPort.IsOpen())
+            {
+                if (ComPort.Connect(comport))
+                {
+                    ComPort.Write("RS");
+                    string temp = ComPort.Read();
+                    if (temp == "error")
+                    {
+                        ComPort.Disconnect();
+                        error = "De Ergometer is niet verbonden";
+                        return false;
+                    }
+                    Thread.Sleep(200);
+                    ComPort.Write("CM");
+                    ComPort.Read();
+                    Thread.Sleep(200);
+
+                    ComPort.Write("ST");
+                    string response = ComPort.Read();
+
+                    SaveMeting(response);
+                }
+                else
+                {
+                    error = "De ergometer is niet verbonden";
+                    return false;
+                }
+            }
+
            if (Doctor == null || !Doctor.Connected)
            {
                if (Doctor == null)
@@ -97,29 +126,6 @@ namespace ErgometerApplication
                Loggedin = true;
            }

-            if (!ComPort.IsOpen())
-            {
-                if (ComPort.Connect(comport))
-                {
-                    ComPort.Write("RS");
-                    ComPort.Read();
-                    Thread.Sleep(200);
-                    ComPort.Write("CM");
-                    ComPort.Read();
-                    Thread.Sleep(200);
-
-                    ComPort.Write("ST");
-                    string response = ComPort.Read();
-
-                    SaveMeting(response);
-                }
-                else
-                {
-                    error = "De ergometer is niet verbonden";
-                    return false;
-                }
-            }
-
            return true;
        }