sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +21 -6
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87e199d1b5 - Show all commits

5
RH-Engine/Command.cs
View File

@@ -215,6 +215,11 @@ namespace RH_Engine
return showOnPanel(uuidPanel, serialCode, "Resistance: " + resistance + " %", 3); return showOnPanel(uuidPanel, serialCode, "Resistance: " + resistance + " %", 3);
} }
public string showMessage(string uuidPanel, string serialCode, string message)
{
return showOnPanel(uuidPanel, serialCode, "Last message: " + message, 5);
}
public string SwapPanelCommand(string uuid) public string SwapPanelCommand(string uuid)
{ {
dynamic payload = new dynamic payload = new

22
RH-Engine/Program.cs
View File

@@ -36,6 +36,12 @@ namespace RH_Engine
private static string bikeId = string.Empty; private static string bikeId = string.Empty;
private static string headId = string.Empty; private static string headId = string.Empty;
private static double bikeSpeed = 6.66;
private static int bpm = 6;
private static int power = 6;
private static int resistance = 6;
private static string lastMessage = "No message received yet";
private static Dictionary<string, HandleSerial> serialResponses = new Dictionary<string, HandleSerial>(); private static Dictionary<string, HandleSerial> serialResponses = new Dictionary<string, HandleSerial>();
private static void Main(string[] args) private static void Main(string[] args)
@@ -189,11 +195,8 @@ namespace RH_Engine
bool speedReplied = false; bool speedReplied = false;
bool moveReplied = true; bool moveReplied = true;
panelId = JSONParser.getPanelID(message); panelId = JSONParser.getPanelID(message);
WriteTextMessage(stream, mainCommand.ColorPanel(panelId));
WriteTextMessage(stream, mainCommand.ClearPanel(panelId)); showPanel(stream, mainCommand);
showPanel(stream, mainCommand, 5.3, 83, 52, 53);
//while (!(speedReplied && moveReplied)) { } //while (!(speedReplied && moveReplied)) { }
@@ -338,8 +341,10 @@ namespace RH_Engine
} }
private static void showPanel(NetworkStream stream, Command mainCommand, double bikeSpeed, int bpm, int power, int resistance) private static void showPanel(NetworkStream stream, Command mainCommand)
{ {
WriteTextMessage(stream, mainCommand.ColorPanel(panelId));
WriteTextMessage(stream, mainCommand.ClearPanel(panelId));
SendMessageAndOnResponse(stream, mainCommand.showBikespeed(panelId, "bikeSpeed", bikeSpeed), "bikeSpeed", SendMessageAndOnResponse(stream, mainCommand.showBikespeed(panelId, "bikeSpeed", bikeSpeed), "bikeSpeed",
(message) => (message) =>
{ {
@@ -360,6 +365,11 @@ namespace RH_Engine
{ {
// TODO check if is drawn // TODO check if is drawn
}); });
SendMessageAndOnResponse(stream, mainCommand.showMessage(panelId, "message", lastMessage), "message",
(message) =>
{
// TODO check if is drawn
});
// Check if every text is drawn! // Check if every text is drawn!