Upload Hardware Configuration & Process Parameters.

1 files changed, 36 insertions, 23 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
index 1cc7b14c7..79c35e462 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
@@ -338,13 +338,27 @@ namespace Tango.Integration.Operators
         }
 
         /// <summary>
+        /// Uploads the specified process parameters to the embedded device.
+        /// </summary>
+        /// <param name="processParameters">The process parameters.</param>
+        /// <returns></returns>
+        public async Task<UploadProcessParametersResponse> UploadProcessParameters(ProcessParametersTable processParameters)
+        {
+            UploadProcessParametersRequest request = new UploadProcessParametersRequest();
+            request.ProcessParameters = new ProcessParameters();
+            processParameters.MapPrimitivesTo(request.ProcessParameters);
+            var result = await SendRequest<UploadProcessParametersRequest, UploadProcessParametersResponse>(request);
+            return result;
+        }
+
+        /// <summary>
         /// Starts jogging the specified motor.
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<MotorJoggingResponse>> StartMotorJogging(MotorJoggingRequest request)
+        public async Task<MotorJoggingResponse> StartMotorJogging(MotorJoggingRequest request)
         {
-            return SendRequest<MotorJoggingRequest, MotorJoggingResponse>(request);
+            return await SendRequest<MotorJoggingRequest, MotorJoggingResponse>(request);
         }
 
         /// <summary>
@@ -352,9 +366,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<MotorAbortJoggingResponse>> StopMotorJogging(MotorAbortJoggingRequest request)
+        public async Task<MotorAbortJoggingResponse> StopMotorJogging(MotorAbortJoggingRequest request)
         {
-            return SendRequest<MotorAbortJoggingRequest, MotorAbortJoggingResponse>(request);
+            return await SendRequest<MotorAbortJoggingRequest, MotorAbortJoggingResponse>(request);
         }
 
         /// <summary>
@@ -362,9 +376,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public IObservable<TangoMessage<MotorHomingResponse>> StartMotorHoming(MotorHomingRequest request)
+        public IObservable<MotorHomingResponse> StartMotorHoming(MotorHomingRequest request)
         {
-            return SendContinuousRequest<MotorHomingRequest, MotorHomingResponse>(request);
+            return SendContinuousRequest<MotorHomingRequest, MotorHomingResponse>(request).Select(x => x.Message);
         }
 
         /// <summary>
@@ -372,9 +386,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<MotorAbortHomingResponse>> StopMotorHoming(MotorAbortHomingRequest request)
+        public async Task<MotorAbortHomingResponse> StopMotorHoming(MotorAbortHomingRequest request)
         {
-            return SendRequest<MotorAbortHomingRequest, MotorAbortHomingResponse>(request);
+            return await SendRequest<MotorAbortHomingRequest, MotorAbortHomingResponse>(request);
         }
 
         /// <summary>
@@ -382,9 +396,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<DispenserJoggingResponse>> StartDispenserJogging(DispenserJoggingRequest request)
+        public async Task<DispenserJoggingResponse> StartDispenserJogging(DispenserJoggingRequest request)
         {
-            return SendRequest<DispenserJoggingRequest, DispenserJoggingResponse>(request);
+            return await SendRequest<DispenserJoggingRequest, DispenserJoggingResponse>(request);
         }
 
         /// <summary>
@@ -392,9 +406,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<DispenserAbortJoggingResponse>> StopDispenserJogging(DispenserAbortJoggingRequest request)
+        public async Task<DispenserAbortJoggingResponse> StopDispenserJogging(DispenserAbortJoggingRequest request)
         {
-            return SendRequest<DispenserAbortJoggingRequest, DispenserAbortJoggingResponse>(request);
+            return await SendRequest<DispenserAbortJoggingRequest, DispenserAbortJoggingResponse>(request);
         }
 
         /// <summary>
@@ -402,9 +416,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public IObservable<TangoMessage<DispenserHomingResponse>> StartDispenserHoming(DispenserHomingRequest request)
+        public IObservable<DispenserHomingResponse> StartDispenserHoming(DispenserHomingRequest request)
         {
-            return SendContinuousRequest<DispenserHomingRequest, DispenserHomingResponse>(request);
+            return SendContinuousRequest<DispenserHomingRequest, DispenserHomingResponse>(request).Select(x => x.Message);
         }
 
         /// <summary>
@@ -412,9 +426,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<DispenserAbortHomingResponse>> StopDispenserHoming(DispenserAbortHomingRequest request)
+        public async Task<DispenserAbortHomingResponse> StopDispenserHoming(DispenserAbortHomingRequest request)
         {
-            return SendRequest<DispenserAbortHomingRequest, DispenserAbortHomingResponse>(request);
+            return await SendRequest<DispenserAbortHomingRequest, DispenserAbortHomingResponse>(request);
         }
 
         /// <summary>
@@ -422,9 +436,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<SetDigitalOutResponse>> SetDigitalOut(SetDigitalOutRequest request)
+        public async Task<SetDigitalOutResponse> SetDigitalOut(SetDigitalOutRequest request)
         {
-            return SendRequest<SetDigitalOutRequest, SetDigitalOutResponse>(request);
+            return await SendRequest<SetDigitalOutRequest, SetDigitalOutResponse>(request);
         }
 
         /// <summary>
@@ -432,9 +446,9 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<ThreadJoggingResponse>> StartThreadJogging(ThreadJoggingRequest request)
+        public async Task<ThreadJoggingResponse> StartThreadJogging(ThreadJoggingRequest request)
         {
-            return SendRequest<ThreadJoggingRequest, ThreadJoggingResponse>(request);
+            return await SendRequest<ThreadJoggingRequest, ThreadJoggingResponse>(request);
         }
 
         /// <summary>
@@ -442,12 +456,11 @@ namespace Tango.Integration.Operators
         /// </summary>
         /// <param name="request">The request.</param>
         /// <returns></returns>
-        public Task<TangoMessage<ThreadAbortJoggingResponse>> StopThreadJogging(ThreadAbortJoggingRequest request)
+        public async Task<ThreadAbortJoggingResponse> StopThreadJogging(ThreadAbortJoggingRequest request)
         {
-            return SendRequest<ThreadAbortJoggingRequest, ThreadAbortJoggingResponse>(request);
+            return await SendRequest<ThreadAbortJoggingRequest, ThreadAbortJoggingResponse>(request);
         }
 
-
         #endregion
     }
 }