diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index 8b06f94..65dfc85 100644 Binary files a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo and b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo differ diff --git a/ErgometerApplication/ErgometerApplication/Ergometer.cs b/ErgometerApplication/ErgometerApplication/Ergometer.cs index 766fe47..40abad6 100644 --- a/ErgometerApplication/ErgometerApplication/Ergometer.cs +++ b/ErgometerApplication/ErgometerApplication/Ergometer.cs @@ -12,6 +12,7 @@ using System.Windows.Forms; using Newtonsoft.Json; using System.IO; using ErgometerLibrary; +using System.Net.Sockets; namespace ErgometerApplication { @@ -20,6 +21,8 @@ namespace ErgometerApplication private ComPort comPort; private List _data; private int i = 0; + int sessionID; + NetCommand command; List readFile = new List(); public Ergometer() { @@ -82,25 +85,7 @@ namespace ErgometerApplication } } - Thread threadRead = new Thread(HandleServerRead); - threadRead.Start(client); - Thread threadWrite = new Thread(HandleServerRead); - threadWrite.Start(client); - } - - private void HandleServerRead() - { - while (connectButton.Text == "Disconnect") - { - - } - } - private void HandleServerWrite() - { - while (connectButton.Text == "Disconnect") - { - - } + sessionID = int.Parse(ReadServer()); } private void statusButton_Click(object sender, EventArgs e) @@ -110,8 +95,9 @@ namespace ErgometerApplication Console.WriteLine(response); Meting m = Meting.Parse(response); SaveData(m); + command = new NetCommand(m, sessionID); + WriteServer(command.ToString()); richTextBox1.Text = m.ToString(); - WriteFile(); } @@ -133,6 +119,8 @@ namespace ErgometerApplication Console.WriteLine(response); Meting m = Meting.Parse(response); SaveData(m); + command = new NetCommand(m, sessionID); + WriteServer(command.ToString()); richTextBox1.Text = m.ToString(); } } diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe index f7d75e8..8edb3fc 100644 Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe differ diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb index 31d2e54..27bbcd8 100644 Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb differ diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll new file mode 100644 index 0000000..ce20e91 Binary files /dev/null and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.dll differ diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.pdb b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.pdb new file mode 100644 index 0000000..d196f20 Binary files /dev/null and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerLibrary.pdb differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 651027d..4d58ec9 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache index a76d3e0..8a650fb 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache index e422a7b..0eb0388 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe index f7d75e8..8edb3fc 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb index 31d2e54..27bbcd8 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb differ