From 588ba2ecc9001ae9650c6b04fcc6f312b5b3f829 Mon Sep 17 00:00:00 2001 From: pehladik Date: Fri, 17 Apr 2020 14:54:27 +0200 Subject: [PATCH] localhost by default, reconnexion ok, panel control ok --- software/monitor/monitor/Client.cs | 2 +- software/monitor/monitor/CommandManager.cs | 9 +++++++-- .../monitor/monitor/DestijlCommandManager.cs | 5 ++++- software/monitor/monitor/monitor | Bin 114176 -> 114176 bytes 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/software/monitor/monitor/Client.cs b/software/monitor/monitor/Client.cs index a2b7ecc..61976b8 100644 --- a/software/monitor/monitor/Client.cs +++ b/software/monitor/monitor/Client.cs @@ -35,7 +35,7 @@ namespace monitor /// /// Default server name /// - public const string defaultIP = "10.105.1.13"; + public const string defaultIP = "localhost"; /// /// Default server port number diff --git a/software/monitor/monitor/CommandManager.cs b/software/monitor/monitor/CommandManager.cs index 03efac1..a77e736 100644 --- a/software/monitor/monitor/CommandManager.cs +++ b/software/monitor/monitor/CommandManager.cs @@ -180,11 +180,16 @@ namespace monitor isBusy = true; // Send command to server + if (timeout > 0) // Command request an acknowledge + { + waitForAcknowledge = true; // Flag used in OnMessageReception callback to avoid + // sending acknowledge message to upper level + } + Client.Write(cmd); if (timeout > 0) // Command request an acknowledge - { - + { waitForAcknowledge = true; // Flag used in OnMessageReception callback to avoid // sending acknowledge message to upper level waitTimer.Interval = timeout; diff --git a/software/monitor/monitor/DestijlCommandManager.cs b/software/monitor/monitor/DestijlCommandManager.cs index 84b1bb9..d3803e7 100644 --- a/software/monitor/monitor/DestijlCommandManager.cs +++ b/software/monitor/monitor/DestijlCommandManager.cs @@ -111,7 +111,8 @@ namespace monitor InvalidAnswer, Busy, CommunicationLostWithRobot, - CommunicationLostWithServer + CommunicationLostWithServer, + CommunicationError } public struct Point { @@ -259,6 +260,8 @@ namespace monitor if (answer.ToUpper().Contains(DestijlCommandList.ANSWER_NACK)) status = CommandStatus.Rejected; // if communication is lost with robot, return CommunicationLostWithRobot else if (answer.ToUpper().Contains(DestijlCommandList.ANSWER_TIMEOUT)) status = CommandStatus.CommunicationLostWithRobot; + + else if (answer.ToUpper().Contains(DestijlCommandList.ANSWER_COM_ERROR)) status = CommandStatus.CommunicationError; // if answer is empty, communication with robot is lost else if (answer.Length == 0) status = CommandStatus.CommunicationLostWithServer; //else status = CommandStatus.InvalidAnswer; diff --git a/software/monitor/monitor/monitor b/software/monitor/monitor/monitor index 91a9f4d836646883dad1f4959056950b51297112..8c205e083edfb16f46253627d4d9683aba331094 100755 GIT binary patch delta 10402 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 delta 10284 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 YRXh($