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 4 additions and 3 deletions
Showing only changes of commit 03a0c6febb - Show all commits

View File

@@ -21,6 +21,8 @@ namespace Hardware.Simulators
private int cadence = 0;
private double resistance = 0;
byte[] array;
public BikeSimulator(IDataConverter dataConverter)
@@ -73,7 +75,7 @@ namespace Hardware.Simulators
private void CalculateVariables(float perlin)
{
this.speed = perlin * 5 / 0.001 ;
array = BitConverter.GetBytes(speed);
Console.WriteLine(speed);
this.distanceTraveled = (distanceTraveled+speed) % 256;

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using Hardware;
using Hardware.Simulators;
namespace ProftaakRH
@@ -14,8 +15,6 @@ namespace ProftaakRH
BikeSimulator bikeSimulator = new BikeSimulator(dataConverter);
bikeSimulator.StartSimulation();
bLEReceiver.Connect();
Console.ReadLine();
}
}