Merge pull request #1 from KettlerX7AvansA5/develop

Merge working version into master

ErgometerUitlezer/Ergometer.cs

@@ -70,7 +70,6 @@ namespace ErgometerUitlezer
                     powerButton.Enabled = false;
                     energyButton.Enabled = false;
                     ComPortBox.Enabled = true;
-                    richTextBox1.Text = "";
                     
                 }
             }
@@ -108,21 +107,16 @@ namespace ErgometerUitlezer
 
         private void timeButton_Click(object sender, EventArgs e)
         {
-            comPort.Write("RS");
-            comPort.Read();
-            Thread.Sleep(200);
             string[] temp = inputTextBox.Text.Split(':');
-            comPort.Write("PT " + temp[0] + temp[1]);
-            Console.WriteLine("PT " + temp[0] + temp[1]);
+            int minutes = int.Parse(temp[0]);
+            int seconds = int.Parse(temp[1]);
+            comPort.Write("PT " + minutes.ToString() + seconds.ToString());
             inputTextBox.Text = "";
             comPort.Read();
         }
 
         private void distanceButton_Click(object sender, EventArgs e)
         {
-            comPort.Write("RS");
-            comPort.Read();
-            Thread.Sleep(200);
             int temp = int.Parse(inputTextBox.Text);
             comPort.Write("PD " + temp.ToString());
             inputTextBox.Text = "";
@@ -139,9 +133,6 @@ namespace ErgometerUitlezer
 
         private void energyButton_Click(object sender, EventArgs e)
         {
-            comPort.Write("RS");
-            comPort.Read();
-            Thread.Sleep(200);
             int temp = int.Parse(inputTextBox.Text);
             comPort.Write("PE " + temp.ToString());
             inputTextBox.Text = "";