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

Bugfixes

Browse Source
This commit is contained in:
kennyboy55
2015-11-04 10:39:41 +01:00
parent aca222c817
commit 2f85ba0a4f
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
+1 -1
View File
@@ -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
+2 -2
View File
@@ -62,7 +62,7 @@ namespace ErgometerApplication
else
deviation = Math.Max(deviation-1, 0);
if(deviation >= 60 && !failed)
if(deviation >= 80 && !failed)
{
workloadStarted = MainClient.GetLastMeting().Seconds;
currentstate = state.COOLINGDOWN;
@@ -127,6 +127,7 @@ namespace ErgometerApplication
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();
@@ -170,7 +171,6 @@ namespace ErgometerApplication
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));
}
else
{
ErgometerIPR/ErgometerApplication/MainClient.cs
+2 -1
View File
@@ -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
+2
View File
@@ -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();