Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
shinichi
2020-10-19 14:02:07 +02:00

View File

@@ -93,19 +93,25 @@ namespace Hardware.Simulators
//Generate an ANT message for page 0x10 //Generate an ANT message for page 0x10
private byte[] GenerateBike0x10() private byte[] GenerateBike0x10()
{ {
//SOMEONE FIX THIS!!!!!!!!!
try try
{ {
byte[] bikeByte = { 0x10, Convert.ToByte(equipmentType), Convert.ToByte(elapsedTime * 4 % 64), Convert.ToByte(distanceTraveled), speedArray[0], speedArray[1], Convert.ToByte(BPM), 0xFF }; byte[] bikeByte = { 0x10, check(equipmentType), check(elapsedTime * 4 % 64), check((int)Math.Round(distanceTraveled)), speedArray[0], speedArray[1], check(BPM), 0xFF };
return bikeByte; return bikeByte;
} }
catch (OverflowException e) catch (OverflowException e)
{ {
Debug.WriteLine(e); Debug.WriteLine(e);
return GenerateBike0x10(); byte[] res = { 0x10,0x00, 0x00, 0x00, 0x00, 0x00, 0x00,0xFF};
return res;
} }
} }
private byte check(int value)
{
return value > 255 ? Convert.ToByte(255) : Convert.ToByte(value);
}
//Generate an ANT message for BPM //Generate an ANT message for BPM
private byte[] GenerateHeart() private byte[] GenerateHeart()
{ {