Quicker ending, always show results when possible.

ErgometerIPR/.gitignore

@@ -0,0 +1 @@
+*.zip

ErgometerIPR/ErgometerApplication/ClientApplicatie.cs

@@ -75,7 +75,7 @@ namespace ErgometerApplication
                     {
                         string error = "";
                         bool connect = false;
-                        foreach(string comport in SerialPort.GetPortNames())
+                        foreach(string comport in SerialPort.GetPortNames().Reverse())
                         {
                             connect = MainClient.Connect(comport, username, password, out error);
                             if (connect)

ErgometerIPR/ErgometerApplication/ErgometerTest.cs

@@ -42,10 +42,21 @@ namespace ErgometerApplication
             this.client = client;
             client.updateStepsText("U begint nu aan een warmup, probeer een tempo van 50 rpm aan te houden. De test gaat automatisch verder.");
 			workloads = new List<Workload>();
+
+            if (gender == 'M')
+            {
+                MainClient.ComPort.Write("PW 50");
+                MainClient.ComPort.Read();
+                currentPower = 50;
+            }
+            else
+            {
                 MainClient.ComPort.Write("PW 25");
                 MainClient.ComPort.Read();
                 currentPower = 25;
-            MainClient.Client.heartBeat.max = (int)CalculateMaximumHeartRate();
+            }
+            
+            MainClient.Client.heartBeat.max = (int)(CalculateMaximumHeartRate()*0.70);
         }
 
         public void timerTick()
@@ -57,7 +68,7 @@ namespace ErgometerApplication
                 MainClient.QuickBeepAudio();
             }
 
-            if (MainClient.GetLastMeting().RPM < 45 || MainClient.GetLastMeting().RPM > 55)
+            if (MainClient.GetLastMeting().RPM < 42 || MainClient.GetLastMeting().RPM > 58)
                 deviation++;
             else
                 deviation = Math.Max(deviation-1, 0);
@@ -77,11 +88,11 @@ namespace ErgometerApplication
             switch(currentstate)
             {
                 case state.WARMUP:
-                    if (MainClient.GetLastMeting().Seconds > 30)
+                    if (MainClient.GetLastMeting().Seconds > 20)
                     {
-                        List<ErgometerLibrary.Meting> last20 = MainClient.Metingen.GetRange(MainClient.Metingen.Count - 20, 20);
+                        List<ErgometerLibrary.Meting> last10 = MainClient.Metingen.GetRange(MainClient.Metingen.Count - 10, 10);
-                        int max = FindMaxValue(last20, x => x.HeartBeat);
+                        int max = FindMaxValue(last10, x => x.HeartBeat);
-                        int min = FindMinValue(last20, x => x.HeartBeat);
+                        int min = FindMinValue(last10, x => x.HeartBeat);
                         if (max + min < 20)
                         {
                             client.updateStepsText("We detecteren geen hartslag. Controleer of de hartslagmeter is verbonden. De test gaat automatisch verder.");
@@ -99,7 +110,7 @@ namespace ErgometerApplication
                             client.updateStepsText("De warmup is voltooid. De test gaat nu beginnen. U begint nu aan de " + NumToText(GetCurrentWorkload()) + " workload.");
                         }
                     }
-                    if (MainClient.GetLastMeting().Seconds > 9 && MainClient.GetLastMeting().Seconds < 11)
+                    if (MainClient.GetLastMeting().Seconds > 4 && MainClient.GetLastMeting().Seconds < 6)
                     {
                         if (MainClient.GetLastMeting().HeartBeat < 20)
                         {
@@ -108,53 +119,56 @@ namespace ErgometerApplication
                     }
                     break;
                 case state.WORKLOAD:
-                    if (MainClient.GetLastMeting().Seconds - workloadStarted > 180)
+                    if (MainClient.GetLastMeting().Seconds - workloadStarted > 30)
                     {
                         currentPower = GetWorkloadPower(GetCurrentWorkload());
                         workloads.Add(new Workload(MainClient.GetLastMeting().Power, workloadHearthbeat));
                         MainClient.ComPort.Write("PW " + currentPower);
                         MainClient.ComPort.Read();
                         client.updateStepsText("U heeft de workload afgerond, u begint nu aan de " + NumToText(GetCurrentWorkload()) + " workload. Uw nieuwe weerstand is " + currentPower + " Watt.");
-                        MainClient.SwitchWorkloadAudio();
+                        
 
                         workloadStarted = MainClient.GetLastMeting().Seconds;
                         workloadHearthbeat = 0;
                         Console.WriteLine("3:00 gefietst, workload" + (GetCurrentWorkload()) + " af, nieuwe waardes maken");
 
-                        //Checken of de heartrate niet groter is dan 75%, anders stoppen
+                        //Checken of de heartrate niet groter is dan 70%, anders stoppen
-                        if (workloadHearthbeat > (CalculateMaximumHeartRate() * 0.80))
+                        if (workloadHearthbeat > (CalculateMaximumHeartRate() * 0.70) || GetCurrentWorkload() >= 4)
                         {
                             workloadStarted = MainClient.GetLastMeting().Seconds;
                             currentstate = state.COOLINGDOWN;
                             MainClient.SwitchTestModeAudio();
+                            MainClient.SendNetCommand(new ErgometerLibrary.NetCommand(CalculateVOMax(), CalculateMET(), CalculatePopulationAverage(), CalculateZScore(), CalculateRating(), MainClient.Session));
                             client.updateStepsText("Uw hartslag heeft het kritieke punt bereikt, we beginnen nu aan de cooldown.");
                             MainClient.ComPort.Write("PW 25");
                             MainClient.ComPort.Read();
                             currentPower = 25;
+                            break;
                         }
+
+                        MainClient.SwitchWorkloadAudio();
                     }
-                    else if (MainClient.GetLastMeting().Seconds - workloadStarted > 160 && workloadHearthbeat == 0)
+                    else if (MainClient.GetLastMeting().Seconds - workloadStarted > 20 && workloadHearthbeat == 0)
                     {
-                        List<ErgometerLibrary.Meting> last150 = MainClient.Metingen.GetRange(MainClient.Metingen.Count - 150, 150);
+                        List<ErgometerLibrary.Meting> last35 = MainClient.Metingen.GetRange(MainClient.Metingen.Count - 35, 35);
-                        workloadHearthbeat = FindAverageValue(last150, x => x.HeartBeat);
+                        workloadHearthbeat = FindAverageValue(last35, x => x.HeartBeat);
-                        Console.WriteLine("2:40 gefiets, gemiddelde harstslag berekenen:" + workloadHearthbeat);
                         client.updateStepsText("U bent nu met de " + NumToText(GetCurrentWorkload()) + " workload bezig. Uw gemiddelde hartslag is berekend als " + workloadHearthbeat + "bpm.");
                     }
-                    else if(MainClient.GetLastMeting().Seconds - workloadStarted > 9 && MainClient.GetLastMeting().Seconds - workloadStarted < 11)
+                    else if(MainClient.GetLastMeting().Seconds - workloadStarted > 4 && MainClient.GetLastMeting().Seconds - workloadStarted < 6)
                     {
                         client.updateStepsText("U bent nu met de " + NumToText(GetCurrentWorkload()) + " workload bezig. De fiets staat nu ingesteld op " + MainClient.GetLastMeting().Power + " Watt");
                     }
                     break;
                 case state.COOLINGDOWN:
-                    if(MainClient.GetLastMeting().Seconds - workloadStarted > 360)
+                    if(MainClient.GetLastMeting().Seconds - workloadStarted > 15)
                     {
                         currentstate = state.STOP;
                         MainClient.SwitchTestModeAudio();
                         client.updateStepsText("De test is afgelopen.");
                     }
-                    else if(MainClient.GetLastMeting().Seconds - workloadStarted > 9 && MainClient.GetLastMeting().Seconds - workloadStarted < 11)
+                    else if(MainClient.GetLastMeting().Seconds - workloadStarted > 4 && MainClient.GetLastMeting().Seconds - workloadStarted < 6)
                     {
-                        client.updateStepsText("U bent momenteel met de cooldown bezig.");
+                        client.updateStepsText("U bent momenteel met de cooldown bezig. U krijgt uw resulataten binnenkort te zien.");
                     }
                     break;
                 case state.STOP:
@@ -162,19 +176,23 @@ namespace ErgometerApplication
                     MainClient.Client.beeptimer.Stop();
                     MainClient.ComPort.Write("RS");
                     MainClient.ComPort.Read();
-                    currentPower = 0;
+                    currentPower = 25;
+                    if (workloads.Count > 1)
+                    {
+                        string str = "";
+
                         if (failed)
                         {
-                        MainClient.Client.updateStepsText("De test is mislukt omdat u te vaak heeft afgeweken van 50rpm. Onze excuses voor het ongemak.");
-                    }
-                    else if (workloads.Count > 1)
-                    {
-                        MainClient.Client.updateStepsText(String.Format("De test is afgelopen. Uw test resultaten zijn: \n VO2MAX: {0:0.00} MET: {1:0.00} Gemiddelde: {2:0.00} \n {3} ", CalculateVOMax(), CalculateMET(), CalculatePopulationAverage(), CalculateRating()));
                             MainClient.SendNetCommand(new ErgometerLibrary.NetCommand(CalculateVOMax(), CalculateMET(), CalculatePopulationAverage(), CalculateZScore(), CalculateRating(), MainClient.Session));
+                            str = "De test is mislukt omdat u te vaak heeft afgeweken van 50rpm. De resultaten kunnen hierdoor afwijken. ";
+                        }
+                        else
+                            str = "De test is afgelopen. ";
+                        MainClient.Client.updateStepsText(String.Format(str + "Uw test resultaten zijn: \n VO2MAX: {0:0.00} MET: {1:0.00} Gemiddelde: {2:0.00} \n {3} ", CalculateVOMax(), CalculateMET(), CalculatePopulationAverage(), CalculateRating()));
                     }
                     else
                     {
-                        MainClient.Client.updateStepsText("Er zijn te weinig workload tests afgenomen om een resultaat te maken. Onze excuses voor het ongemak.");
+                        MainClient.Client.updateStepsText("Er zijn te weinig workload tests afgenomen om een resultaat te maken.");
                     }
                     break;
             }

ErgometerIPR/ErgometerApplication/MainClient.cs

@@ -80,7 +80,8 @@ namespace ErgometerApplication
                 if (ComPort.Connect(comport))
                 {
                     ComPort.Write("RS");
-                    string temp = ComPort.Read();
+                    string temp = ComPort.Read().Replace("\r", "").Replace("\n", "");
+                    Console.WriteLine(temp);
                     if (temp.ToLower() != "ack")
                     {
                         ComPort.Disconnect();

ErgometerIPR/ErgometerServer/DoctorThread.cs

@@ -77,6 +77,8 @@ namespace ErgometerServer
                                     Thread.Sleep(10);
                                     sendToDoctor(new NetCommand(meting, input.Session));      
                                 }
+
+
                                 break;
                             case NetCommand.RequestType.ALLSESSIONS:
                                 List<Tuple<int, string, double>> sessions = FileHandler.GetAllSessions();