Avans/ErgometerIPR
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quicker ending, always show results when possible.

Browse Source
This commit is contained in:
kennyboy55
2015-11-05 14:13:49 +01:00
parent 50da579fc2
commit 6b742acca9
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerIPR/ErgometerApplication/ErgometerTest.cs
+17 -12
View File
@@ -73,7 +73,7 @@ namespace ErgometerApplication
else else
deviation = Math.Max(deviation-1, 0); deviation = Math.Max(deviation-1, 0);
if(deviation >= 80 && !failed) if(deviation >= 60 && !failed)
{ {
workloadStarted = MainClient.GetLastMeting().Seconds; workloadStarted = MainClient.GetLastMeting().Seconds;
currentstate = state.COOLINGDOWN; currentstate = state.COOLINGDOWN;
@@ -132,8 +132,8 @@ namespace ErgometerApplication
workloadHearthbeat = 0; workloadHearthbeat = 0;
Console.WriteLine("3:00 gefietst, workload" + (GetCurrentWorkload()) + " af, nieuwe waardes maken"); 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.70)) if (workloadHearthbeat > (CalculateMaximumHeartRate() * 0.70) || GetCurrentWorkload() >= 4)
{ {
workloadStarted = MainClient.GetLastMeting().Seconds; workloadStarted = MainClient.GetLastMeting().Seconds;
currentstate = state.COOLINGDOWN; currentstate = state.COOLINGDOWN;
@@ -168,7 +168,7 @@ namespace ErgometerApplication
} }
else if(MainClient.GetLastMeting().Seconds - workloadStarted > 4 && MainClient.GetLastMeting().Seconds - workloadStarted < 6) 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; break;
case state.STOP: case state.STOP:
@@ -176,18 +176,23 @@ namespace ErgometerApplication
MainClient.Client.beeptimer.Stop(); MainClient.Client.beeptimer.Stop();
MainClient.ComPort.Write("RS"); MainClient.ComPort.Write("RS");
MainClient.ComPort.Read(); MainClient.ComPort.Read();
currentPower = 0; currentPower = 25;
if(failed) if (workloads.Count > 1)
{ {
MainClient.Client.updateStepsText("De test is mislukt omdat u te vaak heeft afgeweken van 50rpm. Onze excuses voor het ongemak."); string str = "";
}
else if (workloads.Count > 1) if (failed)
{ {
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 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; break;
} }