Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 20 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index 8fd4a6438..232446cb6 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -544,5 +544,11 @@ namespace Tango.Integration.Operation
         /// <param name="processParameters">The process parameters.</param>
         /// <returns></returns>
         Task ContinueThreadLoading(ProcessParametersTable processParameters);
+
+        /// <summary>
+        /// Attempts to jog the thread in order to check whether there are no thread breaking issues.
+        /// </summary>
+        /// <returns></returns>
+        Task AttemptThreadJogging();
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 464e0713f..83579d776 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1384,6 +1384,7 @@ namespace Tango.Integration.Operation
             if (Status == MachineStatuses.Upgrading) return;
 
             Status = MachineStatuses.Disconnected;
+            MachineStatus.State = MachineState.Ready;
 
             SessionLogger.EndSession();
 
@@ -2699,6 +2700,7 @@ namespace Tango.Integration.Operation
                 //Head Cleaning Parameters
                 ticket.HeadCleaningParameters = new HeadCleaningParameters();
                 ticket.HeadCleaningParameters.CleanerFlow = job.Rml.CleanerFlow;
+                ticket.HeadCleaningParameters.ArcHeadCleaningMotorSpeed = job.Rml.ArcHeadCleaningMotorSpeed;
 
                 JobHandler handler = null;
                 StorageFileHandler fileUploadHandler = null;
@@ -4131,6 +4133,18 @@ namespace Tango.Integration.Operation
             }, new TransportRequestConfig() { ShouldLog = true });
         }
 
+        /// <summary>
+        /// Attempts to jog the thread in order to check whether there are no thread breaking issues.
+        /// </summary>
+        /// <returns></returns>
+        public async Task AttemptThreadJogging()
+        {
+            var r = await SendRequest<AttemptThreadJoggingRequest, AttemptThreadJoggingResponse>(new AttemptThreadJoggingRequest()
+            {
+
+            }, new TransportRequestConfig() { ShouldLog = true, Timeout = TimeSpan.FromSeconds(20) });
+        }
+
         #endregion
     }
 }