From 2b2be4523e99e724650673b0a8b6bbbc0fc6f4da Mon Sep 17 00:00:00 2001 From: Kenneth van Ewijk Date: Mon, 2 Nov 2015 14:18:29 +0100 Subject: [PATCH] Added check if heartbeat is zero --- .../ErgometerApplication/ClientApplicatie.cs | 1 - ErgometerIPR/ErgometerApplication/ErgometerTest.cs | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs b/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs index 89969b2..a70e900 100644 --- a/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs +++ b/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs @@ -104,7 +104,6 @@ namespace ErgometerApplication { steps.setText(text); MainClient.SendNetCommand(new NetCommand(MainClient.Session, text)); - Console.Beep(1200, 500); } public void CreateNewTest(char geslacht, int leeftijd, int gewicht, int lengte) diff --git a/ErgometerIPR/ErgometerApplication/ErgometerTest.cs b/ErgometerIPR/ErgometerApplication/ErgometerTest.cs index 7fa5310..cb4858a 100644 --- a/ErgometerIPR/ErgometerApplication/ErgometerTest.cs +++ b/ErgometerIPR/ErgometerApplication/ErgometerTest.cs @@ -47,7 +47,11 @@ namespace ErgometerApplication List 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)