From bb30538f000358b3b5fb7323bd1b03b0489b09ab Mon Sep 17 00:00:00 2001 From: Logophilist Date: Fri, 25 Sep 2020 14:12:16 +0200 Subject: [PATCH] added features panel --- ProftaakRH/Main.cs | 6 +++--- RH-Engine/Command.cs | 33 +++++++++++++++++++++++++++++++-- RH-Engine/Program.cs | 8 +++++--- 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/ProftaakRH/Main.cs b/ProftaakRH/Main.cs index eb0c2a5..5ffcab4 100644 --- a/ProftaakRH/Main.cs +++ b/ProftaakRH/Main.cs @@ -13,9 +13,9 @@ namespace ProftaakRH { IDataReceiver dataReceiver = new DataConverter(); BLEHandler bLEHandler = new BLEHandler(dataReceiver); - //BikeSimulator bikeSimulator = new BikeSimulator(dataConverter); - //bikeSimulator.setResistance(bikeSimulator.GenerateResistance(1f)); - //bikeSimulator.StartSimulation(); + BikeSimulator bikeSimulator = new BikeSimulator(dataReceiver); + bikeSimulator.setResistance(bikeSimulator.GenerateResistance(1f)); + bikeSimulator.StartSimulation(); bool running = true; diff --git a/RH-Engine/Command.cs b/RH-Engine/Command.cs index dd3d7ff..dd8fdb4 100644 --- a/RH-Engine/Command.cs +++ b/RH-Engine/Command.cs @@ -131,7 +131,36 @@ namespace RH_Engine return JsonConvert.SerializeObject(Payload(payload)); } - public string bikeSpeed(string uuidPanel) + public string ColorPanel(string uuidPanel) + { + dynamic payload = new + { + id = "scene/panel/setclearcolor", + data = new + { + id = uuidPanel, + color = new int[] { 1, 1, 1, 1 } + } + }; + + return JsonConvert.SerializeObject(Payload(payload)); + } + + public string SwapPanel(string uuid) + { + dynamic payload = new + { + id = "scene/panel/swap", + data = new + { + id = uuid + } + }; + + return JsonConvert.SerializeObject(Payload(payload)); + } + + public string bikeSpeed(string uuidPanel, double speed) { dynamic payload = new { @@ -140,7 +169,7 @@ namespace RH_Engine { id = uuidPanel, text = "Bike speed placeholder", - position = new int[] { 100, 100 }, + position = new int[] { 0, 0 }, size = 32.0, color = new int[] { 0, 0, 0, 1 }, font = "segoeui" diff --git a/RH-Engine/Program.cs b/RH-Engine/Program.cs index 9aaa7f6..d965579 100644 --- a/RH-Engine/Program.cs +++ b/RH-Engine/Program.cs @@ -175,10 +175,12 @@ namespace RH_Engine string uuidPanel = JSONParser.getPanelID(response); WriteTextMessage(stream, mainCommand.ClearPanel(uuidPanel)); Console.WriteLine(ReadPrefMessage(stream)); - WriteTextMessage(stream, mainCommand.bikeSpeed(uuidPanel)); + WriteTextMessage(stream, mainCommand.bikeSpeed(uuidPanel, 2.42)); Console.WriteLine(ReadPrefMessage(stream)); - - WriteTextMessage(stream, mainCommand.SwapPanelCommand(uuidPanel)); + WriteTextMessage(stream, mainCommand.ColorPanel(uuidPanel)); + Console.WriteLine("Color panel: " + ReadPrefMessage(stream)); + WriteTextMessage(stream, mainCommand.SwapPanel(uuidPanel)); + Console.WriteLine("Swap panel: " + ReadPrefMessage(stream)); } ///