Merge develop into master #1

Merged
SemvdH merged 40 commits from develop into master 2020-09-11 13:34:57 +00:00
2 changed files with 7 additions and 2 deletions
Showing only changes of commit 226bc265ef - Show all commits

View File

@@ -140,10 +140,10 @@ namespace Hardware
antMessage[i] = 0xFF; antMessage[i] = 0xFF;
} }
//antMessage[10] = (byte)Math.Max(Math.Min(Math.Round(percentage / 0.5), 255), 0); //antMessage[10] = (byte)Math.Max(Math.Min(Math.Round(percentage / 0.5), 255), 0);
antMessage[11] = 50; //hardcoded for testing antMessage[11] = 100; //hardcoded for testing
byte checksum = 0; byte checksum = 0;
for (int i = 0; i < antMessage.Length -1; i++) for (int i = 0; i < antMessage.Length; i++)
{ {
checksum ^= antMessage[i]; checksum ^= antMessage[i];
} }

View File

@@ -25,6 +25,11 @@ namespace ProftaakRH
Console.WriteLine("odlodlJNgeojhtosj\n/nng;sjonghjsngl;zdf\nnhgLLBJHS\nEOGHSFJBNSLDFJSLDFJGHOAIJo;r\njnAJFVBHHBRG"); Console.WriteLine("odlodlJNgeojhtosj\n/nng;sjonghjsngl;zdf\nnhgLLBJHS\nEOGHSFJBNSLDFJSLDFJGHOAIJo;r\njnAJFVBHHBRG");
bLEHandler.setResistance(50); bLEHandler.setResistance(50);
bLEHandler.setResistance(50);
bLEHandler.setResistance(50);
bLEHandler.setResistance(50);
bLEHandler.setResistance(50);
bLEHandler.setResistance(50);
Console.ReadLine(); Console.ReadLine();