From 5f65eb32fdb0fae65ea0276b0b6a4d8dcce6a58a Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 16 Sep 2020 16:04:21 +0200 Subject: [PATCH] senior gesprek fixes --- ProftaakRH/Main.cs | 1 + RH-Engine/CreateGraphics.cs | 2 +- RH-Engine/JSONParser.cs | 3 ++- RH-Engine/Program.cs | 7 ++++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ProftaakRH/Main.cs b/ProftaakRH/Main.cs index 0938089..80680d7 100644 --- a/ProftaakRH/Main.cs +++ b/ProftaakRH/Main.cs @@ -13,6 +13,7 @@ namespace ProftaakRH { IDataConverter dataConverter = new DataConverter(); BLEHandler bLEHandler = new BLEHandler(dataConverter); + bLEHandler.Connect(); //BikeSimulator bikeSimulator = new BikeSimulator(dataConverter); //bikeSimulator.setResistance(bikeSimulator.GenerateResistance(1f)); //bikeSimulator.StartSimulation(); diff --git a/RH-Engine/CreateGraphics.cs b/RH-Engine/CreateGraphics.cs index 943a61c..9327f93 100644 --- a/RH-Engine/CreateGraphics.cs +++ b/RH-Engine/CreateGraphics.cs @@ -60,7 +60,7 @@ namespace RH_Engine return sb.ToString(); } - public string SkyboxCommand(int time) + public string SkyboxCommand(double time) { if (time < 0 || time > 24) { diff --git a/RH-Engine/JSONParser.cs b/RH-Engine/JSONParser.cs index 248ba73..d2e167f 100644 --- a/RH-Engine/JSONParser.cs +++ b/RH-Engine/JSONParser.cs @@ -34,8 +34,9 @@ namespace RH_Engine { dynamic jsonData = JsonConvert.DeserializeObject(msg); Newtonsoft.Json.Linq.JArray data = jsonData.data; - foreach (dynamic d in data) + for (int i = data.Count-1; i >= 0; i--) { + dynamic d = data[i]; foreach (PC pc in PCs) { if (d.clientinfo.host == pc.host && d.clientinfo.user == pc.user) diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index c03587a..1a6577e 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -12,8 +12,8 @@ namespace RH_Engine internal class Program { private static PC[] PCs = { - //new PC("DESKTOP-M2CIH87", "Fabian"), - //new PC("T470S", "Shinichi"), + new PC("DESKTOP-M2CIH87", "Fabian"), + new PC("T470S", "Shinichi"), new PC("DESKTOP-DHS478C", "semme"), new PC("DESKTOP-TV73FKO", "Wouter"), new PC("NA", "Ralf"), @@ -23,6 +23,7 @@ namespace RH_Engine TcpClient client = new TcpClient("145.48.6.10", 6666); CreateConnection(client.GetStream()); + Console.Read(); } @@ -85,7 +86,7 @@ namespace RH_Engine } CreateGraphics createGraphics = new CreateGraphics(tunnelID); - string command = createGraphics.SkyboxCommand(10); + string command = createGraphics.SkyboxCommand(2); Console.WriteLine("tunnelID is: " + tunnelID);