From ab360cb44d174f25e45c6ec62a42f052a5bc8528 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Mon, 21 Sep 2015 12:58:43 +0200
Subject: [PATCH] Changed something

---
 .../.vs/ErgometerApplication/v14/.suo         | Bin 65024 -> 71168 bytes
 .../ErgometerApplication/Comport.cs           |  65 ------------------
 .../ErgometerApplication/Ergometer.cs         |   7 +-
 .../ErgometerApplication.csproj               |   9 ++-
 .../ErgometerApplication/FormatHelper.cs      |  32 ---------
 .../ErgometerApplication/Meting.cs            |  51 --------------
 6 files changed, 10 insertions(+), 154 deletions(-)
 delete mode 100644 ErgometerApplication/ErgometerApplication/Comport.cs
 delete mode 100644 ErgometerApplication/ErgometerApplication/FormatHelper.cs
 delete mode 100644 ErgometerApplication/ErgometerApplication/Meting.cs

diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo
index 104d76594a09b4a2f858564b7ca48a4ba8bf7650..8b06f94371b543780c78d5c52e6c58554d2037fd 100644
GIT binary patch
delta 3684
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
Hww!$hEqhkp

delta 4015
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
a?0?H(7Q^Coi%=;3poc1C<(_+ZSo|9sytlpp

diff --git a/ErgometerApplication/ErgometerApplication/Comport.cs b/ErgometerApplication/ErgometerApplication/Comport.cs
deleted file mode 100644
index 57ede15..0000000
--- a/ErgometerApplication/ErgometerApplication/Comport.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO.Ports;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ErgometerApplication
-{
-    class ComPort
-    {
-        private SerialPort comPort;
-
-        public ComPort()
-        {
-            comPort = null;
-        }
-
-        public Boolean Connect(string port)
-        {
-            comPort = new SerialPort();
-            comPort.PortName = port;
-            comPort.DataBits = 8;
-            comPort.Parity = Parity.None;
-            comPort.StopBits = StopBits.One;
-            comPort.BaudRate = 9600;
-
-            comPort.Open();
-
-            return comPort.IsOpen;
-        }
-
-        public Boolean Disconnect()
-        {
-            comPort.Close();
-            return !comPort.IsOpen;
-        }
-
-        public Boolean IsOpen()
-        {
-            if (comPort != null)
-                return comPort.IsOpen;
-            else
-                return false;
-        }
-
-        public void Write(string input)
-        {
-            if (IsOpen())
-            {
-                comPort.WriteLine(input);
-            }
-        }
-
-        public string Read()
-        {
-            if (IsOpen())
-            {
-                return comPort.ReadLine();
-            }
-
-            return "";
-        }
-    }
-}
diff --git a/ErgometerApplication/ErgometerApplication/Ergometer.cs b/ErgometerApplication/ErgometerApplication/Ergometer.cs
index deb03eb..130bd34 100644
--- a/ErgometerApplication/ErgometerApplication/Ergometer.cs
+++ b/ErgometerApplication/ErgometerApplication/Ergometer.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 using System.IO;
+using ErgometerLibrary;
 
 namespace ErgometerApplication
 {
@@ -55,7 +56,7 @@ namespace ErgometerApplication
                     string response = comPort.Read();
                     Console.WriteLine(response);
 
-                    Meting m = FormatHelper.Status(response);
+                    Meting m = Meting.Parse(response);
                     SaveData(m);
                     richTextBox1.Text = m.ToString();
                 }
@@ -90,7 +91,7 @@ namespace ErgometerApplication
             comPort.Write("ST");
             string response = comPort.Read();
             Console.WriteLine(response);
-            Meting m = FormatHelper.Status(response);
+            Meting m = Meting.Parse(response);
             SaveData(m);
             richTextBox1.Text = m.ToString();
 
@@ -113,7 +114,7 @@ namespace ErgometerApplication
                 comPort.Write("ST");
                 string response = comPort.Read();
                 Console.WriteLine(response);
-                Meting m = FormatHelper.Status(response);
+                Meting m = Meting.Parse(response);
                 SaveData(m);
                 richTextBox1.Text = m.ToString();
             }
diff --git a/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj b/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj
index a54bb55..38b0c00 100644
--- a/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj
+++ b/ErgometerApplication/ErgometerApplication/ErgometerApplication.csproj
@@ -33,6 +33,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ErgometerLibrary">
+      <HintPath>..\..\..\ErgometerLibrary\ErgometerLibrary\ErgometerLibrary\bin\Debug\ErgometerLibrary.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
@@ -50,9 +53,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Meting.cs" />
-    <Compile Include="FormatHelper.cs" />
-    <Compile Include="Comport.cs" />
     <Compile Include="Ergometer.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -87,6 +87,9 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ErgometerApplication/ErgometerApplication/FormatHelper.cs b/ErgometerApplication/ErgometerApplication/FormatHelper.cs
deleted file mode 100644
index b514bbd..0000000
--- a/ErgometerApplication/ErgometerApplication/FormatHelper.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ErgometerApplication
-{
-    class FormatHelper
-    {
-        public static Meting Status(string input)
-        {
-            String[] status = input.Split('\t');
-
-            if (status.Length != 8)
-                return null;
-
-            int heartbeat = int.Parse(status[0]);
-            int rpm = int.Parse(status[1]);
-            double speed = double.Parse(status[2]) / 10;
-            double distance = double.Parse(status[3]) / 10;
-            int power = int.Parse(status[4]);
-            int energy = int.Parse(status[5]);
-            int actualpower = int.Parse(status[7]);
-
-            string[] temp = status[6].Split(':');
-            int seconds = (int.Parse(temp[0]) * 60) + (int.Parse(temp[1]));
-
-            return new Meting(heartbeat, rpm, speed, distance, power, energy, seconds, actualpower, (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ErgometerApplication/ErgometerApplication/Meting.cs b/ErgometerApplication/ErgometerApplication/Meting.cs
deleted file mode 100644
index c17535a..0000000
--- a/ErgometerApplication/ErgometerApplication/Meting.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ErgometerApplication
-{
-    public class Meting
-    {
-        public int HeartBeat { get; set; }
-        public int RPM { get; set; }
-        public double Speed { get; set; }
-        public double Distance { get; set; }
-        public int Power { get; set; }
-        public int Energy { get; set; }
-        public int Seconds { get; set; }
-        public int ActualPower { get; set; }
-        public double TimeStamp { get; }
-
-        public Meting(int heartbeat, int rpm, double speed, double distance, int power, int energy, int seconds, int actualpower, double timestamp)
-        {
-            HeartBeat = heartbeat;
-            RPM = rpm;
-            Speed = speed;
-            Distance = distance;
-            Power = power;
-            Energy = energy;
-            Seconds = seconds;
-            ActualPower = actualpower;
-            TimeStamp = timestamp;
-        }
-        public Meting()
-        {
-
-        }
-        public override string ToString()
-        {
-            string temp = "";
-            temp += "Heartbeat: " + HeartBeat + "\n";
-            temp += "RPM: " + RPM + "\n";
-            temp += "Speed: " + Speed + "\n";
-            temp += "Distance: " + Distance + "\n";
-            temp += "Power: " + Power + "\n";
-            temp += "Energy: " + Energy + "\n";
-            temp += "Seconds: " + Seconds + "\n";
-            temp += "ActualPower: " + ActualPower + "\n";
-            return temp;
-        }
-    }
-}