Merge remote-tracking branch 'origin/develop' into develop

Conflicts: ErgometerApplication/.vs/ErgometerApplication/v14/.suo ErgometerApplication/ErgometerApplication/Ergometer.cs ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.exe ErgometerApplication/ErgometerApplication/bin/Debug/ErgometerApplication.pdb ErgometerApplication/ErgometerApplication/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.FileListAbsolute.txt ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csproj.GenerateResource.Cache ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.csprojResolveAssemblyReference.cache ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.exe ErgometerApplication/ErgometerApplication/obj/Debug/ErgometerApplication.pdb
2015-09-17 15:18:48 +02:00
parent 8e6e091390 84cded4d6b
commit 81252a2d0c
7 changed files with 4 additions and 0 deletions
@@ -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;
                }
@@ -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
+