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

Fixed string.format bug (reverted from commit 34ade8178b)

Browse Source
This commit is contained in:
Janco Kock
2015-11-02 15:02:06 +01:00
parent 9308d5cea0
commit 314a1964b6
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerIPR/ErgometerApplication/ErgometerTest.cs
+12 -1
View File
@@ -47,7 +47,11 @@ namespace ErgometerApplication
List<ErgometerLibrary.Meting> last10 = MainClient.Metingen.GetRange(MainClient.Metingen.Count - 10, 10);
int max = FindMaxValue(last10, x => x.HeartBeat);
int min = FindMinValue(last10, x => x.HeartBeat);
if(max - min > 10) //Hartslag niet stabiel
if(max + min < 20)
{
client.updateStepsText("We detecteren geen hartslag. Controleer of de hartslagmeter is verbonden.");
}
else if (max - min > 10) //Hartslag niet stabiel
{
client.updateStepsText("Uw hartslag is niet stabiel, probeer een tempo van 50 rpm aan te houden. De test gaat automatisch verder.");
return;
@@ -60,6 +64,13 @@ namespace ErgometerApplication
client.updateStepsText("De warmup is voltooid. U begint nu aan de " + NumToText(GetCurrentWorkload()) + " workload.");
}
}
if (MainClient.GetLastMeting().Seconds > 8 && MainClient.GetLastMeting().Seconds < 10)
{
if(MainClient.GetLastMeting().HeartBeat < 20)
{
client.updateStepsText("We detecteren geen hartslag. Controleer of de hartslagmeter is verbonden.");
}
}
break;
case state.WORKLOAD:
if (MainClient.GetLastMeting().Seconds - workloadStarted > 180)