diff --git a/ErgometerApplication/.vs/ErgometerApplication/v14/.suo b/ErgometerApplication/.vs/ErgometerApplication/v14/.suo index b0f05b1..b56e9c7 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 ecbbb6a..c70740b 100644 --- a/ErgometerApplication/ErgometerApplication/Ergometer.cs +++ b/ErgometerApplication/ErgometerApplication/Ergometer.cs @@ -9,6 +9,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using Newtonsoft.Json; namespace ErgometerApplication { @@ -54,7 +55,9 @@ namespace ErgometerApplication Console.WriteLine(response); Meting test = FormatHelper.Status(response); + Write = test; + string test2 = test.ToString(); richTextBox1.Text = test2; } diff --git a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe index d63134c..f7d75e8 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 1c4d49d..31d2e54 100644 Binary files a/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb and b/ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb differ diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt index f3c5ad6..7d26eab 100644 --- a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt +++ b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt @@ -17,3 +17,4 @@ C:\Users\sander\Documents\GitHub\ErgometerApplication\ErgometerApplication\Ergom C:\Users\sander\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.Ergometer.resources C:\Users\sander\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.Properties.Resources.resources C:\Users\sander\Documents\GitHub\ErgometerApplication\ErgometerApplication\ErgometerApplication\obj\Debug\ErgometerApplication.csproj.GenerateResource.Cache + diff --git a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe index d63134c..f7d75e8 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 1c4d49d..31d2e54 100644 Binary files a/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb and b/ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb differ