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 +9 -19
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 478a2daab7 - Show all commits

28
Server/Client.cs
View File

@@ -155,19 +155,19 @@ namespace Server
} }
else if (DataParser.isRawDataBikeServer(message)) else if (DataParser.isRawDataBikeServer(message))
{ {
Bikedata = true; //Bikedata = true;
saveData?.WriteDataRAWBike(payloadbytes); saveData?.WriteDataRAWBike(payloadbytes);
Array.Copy(this.BikeDataBuffer, 0, this.BikeDataBuffer, 8, 8); Array.Copy(this.BikeDataBuffer, 0, this.BikeDataBuffer, 8, 8);
Array.Copy(payloadbytes, 0, this.BikeDataBuffer, 0, 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.BikeDataBuffer, 0, 2); 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,20 +270,10 @@ namespace Server
private void SendDataToDoctor(object sender, ElapsedEventArgs e) private void SendDataToDoctor(object sender, ElapsedEventArgs e)
{ {
/*if (Bikedata) 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.GetRawBikeDataDoctor(this.BikeDataBuffer.Take(8).ToArray(), this.username)); this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(this.BPMDataBuffer, this.username));
this.communication.Doctor?.sendMessage(DataParser.GetRawBikeDataDoctor(this.BikeDataBuffer.Skip(8).ToArray(), this.username));
Bikedata = false;
}
if (BPMdata)
{
this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(this.BPMDataBuffer, this.username));
BPMdata = false;
}*/
} }
} }
} }