sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +22 -10
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da9d3184a1 - Show all commits

32
Server/Client.cs
View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Sockets; using System.Net.Sockets;
@@ -23,10 +24,11 @@ namespace Server
private DateTime sessionStart; private DateTime sessionStart;
private string fileName; private string fileName;
private Timer timer; private Timer timer;
private byte[] BikeDataBuffer; private volatile byte[] BikeDataBuffer;
private byte[] BPMDataBuffer; private volatile byte[] BPMDataBuffer;
private bool BPMdata = false; private bool BPMdata = false;
private bool Bikedata = false; private bool Bikedata = false;
private object token = new object { };
public Client(Communication communication, TcpClient tcpClient) public Client(Communication communication, TcpClient tcpClient)
{ {
@@ -39,8 +41,9 @@ namespace Server
this.BikeDataBuffer = new byte[16]; this.BikeDataBuffer = new byte[16];
this.BPMDataBuffer = new byte[2]; this.BPMDataBuffer = new byte[2];
this.timer.Interval = 1000; this.timer.Interval = 1000;
this.timer.AutoReset = true; this.timer.AutoReset = false;
this.timer.Elapsed += SendDataToDoctor; this.timer.Elapsed += SendDataToDoctor;
Console.WriteLine("token is " + token);
stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null); stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnRead), null);
} }
@@ -158,15 +161,21 @@ namespace Server
{ {
//Bikedata = true; //Bikedata = true;
saveData?.WriteDataRAWBike(payloadbytes); saveData?.WriteDataRAWBike(payloadbytes);
Array.Copy(this.BikeDataBuffer, 0, this.BikeDataBuffer, 8, 8); lock (token)
Array.Copy(payloadbytes, 0, this.BikeDataBuffer, 0, 8); {
Array.Copy(this.BikeDataBuffer, 0, this.BikeDataBuffer, 8, 8);
Array.Copy(payloadbytes, 0, this.BikeDataBuffer, 0, 8);
}
//this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(payloadbytes, this.username)); //this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(payloadbytes, this.username));
} }
else if (DataParser.isRawDataBPMServer(message)) else if (DataParser.isRawDataBPMServer(message))
{ {
//BPMdata = true; //BPMdata = true;
saveData?.WriteDataRAWBPM(payloadbytes); saveData?.WriteDataRAWBPM(payloadbytes);
Array.Copy(payloadbytes, 0, this.BPMDataBuffer, 0, 2); lock (token)
{
Array.Copy(payloadbytes, 0, this.BPMDataBuffer, 0, 2);
}
//this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(payloadbytes, this.username)); //this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(payloadbytes, this.username));
} }
@@ -270,10 +279,13 @@ namespace Server
private void SendDataToDoctor(object sender, ElapsedEventArgs e) private void SendDataToDoctor(object sender, ElapsedEventArgs e)
{ {
this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(this.BikeDataBuffer.Take(8).ToArray(), this.username)); lock (token)
this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(this.BikeDataBuffer.Skip(8).ToArray(), this.username)); {
this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(this.BPMDataBuffer, this.username)); this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(this.BikeDataBuffer.Take(8).ToArray(), this.username));
this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(this.BikeDataBuffer.Skip(8).ToArray(), this.username));
this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(this.BPMDataBuffer, this.username));
}
this.timer.Start();
} }
} }
} }