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

Merge develop into master #1

Merged
SemvdH merged 40 commits from develop into master 2020-09-11 13:34:57 +00:00
Conversation 4 Commits 40 Files Changed 6 +2 -4
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5c29a9c064 - Show all commits

6
ProftaakRH/BLEHandler.cs
View File

@@ -99,9 +99,7 @@ namespace Hardware
private void BleBike_SubscriptionValueChanged(object sender, BLESubscriptionValueChangedEventArgs e) private void BleBike_SubscriptionValueChanged(object sender, BLESubscriptionValueChangedEventArgs e)
{ {
//Console.WriteLine("Received from {0}: {1}", e.ServiceName,
// BitConverter.ToString(e.Data).Replace("-", " "));
//send to dataconverter
if (e.ServiceName == "6e40fec2-b5a3-f393-e0a9-e50e24dcca9e") if (e.ServiceName == "6e40fec2-b5a3-f393-e0a9-e50e24dcca9e")
{ {
@@ -140,7 +138,7 @@ namespace Hardware
antMessage[i] = 0xFF; antMessage[i] = 0xFF;
} }
antMessage[11] = (byte)Math.Max(Math.Min(Math.Round(percentage / 0.5), 255), 0); antMessage[11] = (byte)Math.Max(Math.Min(Math.Round(percentage / 0.5), 255), 0);
//antMessage[11] = 50; //hardcoded for testing
byte checksum = 0; byte checksum = 0;
for (int i = 0; i < 12; i++) for (int i = 0; i < 12; i++)