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

21
ClientApp/Utils/Client.cs
View File

@@ -21,7 +21,7 @@ namespace ClientApp.Utils
private byte[] totalBuffer = new byte[1024]; private byte[] totalBuffer = new byte[1024];
private int totalBufferReceived = 0; private int totalBufferReceived = 0;
public EngineConnection engineConnection; public EngineConnection engineConnection;
private bool sessionRunning = false; private bool sessionRunning = true;
private IHandler handler = null; private IHandler handler = null;
private LoginViewModel LoginViewModel; private LoginViewModel LoginViewModel;
@@ -146,6 +146,7 @@ namespace ClientApp.Utils
case DataParser.STOP_SESSION: case DataParser.STOP_SESSION:
Console.WriteLine("Stop session identifier"); Console.WriteLine("Stop session identifier");
this.sessionRunning = false; this.sessionRunning = false;
stopBikeInSimulation();
Debug.WriteLine("stop"); Debug.WriteLine("stop");
break; break;
case DataParser.SET_RESISTANCE: case DataParser.SET_RESISTANCE:
@@ -230,14 +231,12 @@ namespace ClientApp.Utils
} }
byte[] message = DataParser.GetRawBPMDataMessageServer(bytes); byte[] message = DataParser.GetRawBPMDataMessageServer(bytes);
if (engineConnection.Connected && engineConnection.FollowingRoute) if (engineConnection != null && engineConnection.Connected && engineConnection.FollowingRoute)
{ {
engineConnection.BikeBPM = bytes[1]; engineConnection.BikeBPM = bytes[1];
} }
this.stream?.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
} }
/// <summary> /// <summary>
@@ -256,21 +255,29 @@ namespace ClientApp.Utils
throw new ArgumentNullException("no bytes"); throw new ArgumentNullException("no bytes");
} }
byte[] message = DataParser.GetRawBikeDataMessageServer(bytes); byte[] message = DataParser.GetRawBikeDataMessageServer(bytes);
bool canSendToEngine = engineConnection.Connected && engineConnection.FollowingRoute; bool canSendToEngine = engineConnection != null && engineConnection.Connected && engineConnection.FollowingRoute && this.sessionRunning;
switch (bytes[0]) switch (bytes[0])
{ {
case 0x10: case 0x10:
if (canSendToEngine) engineConnection.BikeSpeed = (bytes[4] | (bytes[5] << 8)) * 0.01f; if (canSendToEngine) engineConnection.BikeSpeed = (bytes[4] | (bytes[5] << 8)) * 0.01f;
else if (engineConnection != null) engineConnection.BikeSpeed = 0;
break; break;
case 0x19: case 0x19:
if (canSendToEngine) engineConnection.BikePower = (bytes[5]) | (bytes[6] & 0b00001111) << 8; if (canSendToEngine) engineConnection.BikePower = (bytes[5]) | (bytes[6] & 0b00001111) << 8;
else if (engineConnection != null) engineConnection.BikePower = 0;
break; break;
} }
this.stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null); this.stream?.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
}
private void stopBikeInSimulation()
{
engineConnection.BikeSpeed = 0;
engineConnection.BikePower = 0;
} }
#endregion #endregion