merge

1 files changed, 28 insertions, 152 deletions

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index e7d3cd0e8..733f7a981 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -23,9 +23,6 @@ using Tango.PMR.FirmwareUpgrade;
 using Tango.Integration.JobRuns;
 using Tango.Integration.Emergency;
 using Tango.PMR.MachineStatus;
-using Tango.PMR.ThreadLoading;
-using Tango.PMR.Power;
-using Tango.PMR.IFS;
 
 namespace Tango.Integration.Operation
 {
@@ -51,21 +48,11 @@ namespace Tango.Integration.Operation
         JobUnitsMethods JobUnitsMethod { get; set; }
 
         /// <summary>
-        /// Gets or sets the way of calculating how much liquid was spent during the job.
-        /// </summary>
-        JobLiquidQuantityCalculationMode JobLiquidQuantityCalculationMode { get; set; }
-
-        /// <summary>
         /// Gets the current machine status.
         /// </summary>
         MachineStatuses Status { get; }
 
         /// <summary>
-        /// Gets a value indicating whether the machine is connected and status is not disconnected.
-        /// </summary>
-        bool IsConnected { get; }
-
-        /// <summary>
         /// Gets or sets a value indicating whether to enable liquid quantity validation before starting the job.
         /// The validation is done using the reported <see cref="MachineStatus"/>.
         /// </summary>
@@ -77,16 +64,6 @@ namespace Tango.Integration.Operation
         MachineStatus MachineStatus { get; }
 
         /// <summary>
-        /// Gets the current thread loading status.
-        /// </summary>
-        StartThreadLoadingResponse ThreadLoadingStatus { get; }
-
-        /// <summary>
-        /// Gets the ink filling status.
-        /// </summary>
-        InkFillingStatus InkFillingStatus { get; }
-
-        /// <summary>
         /// Gets or sets the firmware upgrade mode.
         /// </summary>
         FirmwareUpgradeModes FirmwareUpgradeMode { get; set; }
@@ -122,11 +99,6 @@ namespace Tango.Integration.Operation
         bool CanPrint { get; }
 
         /// <summary>
-        /// Gets or sets the general continuous request timeout.
-        /// </summary>
-        TimeSpan ContinuousRequestTimeout { get; set; }
-
-        /// <summary>
         /// Occurs when the machine <see cref="Status"/> has changed.
         /// </summary>
         event EventHandler<MachineStatuses> StatusChanged;
@@ -167,94 +139,49 @@ namespace Tango.Integration.Operation
         event EventHandler<ResumingJobEventArgs> ResumingJob;
 
         /// <summary>
-        /// Occurs when there is new diagnostics data available.
+        /// Occurs when a request has been sent.
         /// </summary>
-        event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable;
+        event EventHandler<IMessage> RequestSent;
 
         /// <summary>
-        /// Occurs when an events notification has been received from the embedded device.
+        /// Occurs when a request response has been received.
         /// </summary>
-        event EventHandler<StartEventsNotificationResponse> EventsNotification;
+        event EventHandler<IMessage> ResponseReceived;
 
         /// <summary>
-        /// Occurs when a new debug log is available.
+        /// Occurs when a response has been sent.
         /// </summary>
-        event EventHandler<StartDebugLogResponse> DebugLogAvailable;
+        event EventHandler<IMessage> ResponseSent;
 
         /// <summary>
-        /// Occurs when machine embedded device status has changed.
+        /// Occurs when a request has failed.
         /// </summary>
-        event EventHandler<MachineStatus> MachineStatusChanged;
+        event EventHandler<RequestFailedEventArgs> RequestFailed;
 
         /// <summary>
-        /// Occurs when a new cartridge validation request has been received.
-        /// </summary>
-        event EventHandler<CartridgeValidationEventArgs> CartridgeValidationRequestReceived;
-
-        /// <summary>
-        /// Occurs when the machine was connected and device has reported IsAfterReset.
-        /// </summary>
-        event EventHandler FirmwareStarted;
-
-        /// <summary>
-        /// Occurs when the power up sequence has started.
-        /// </summary>
-        event EventHandler<StartPowerUpResponse> PowerUpStarted;
-
-        /// <summary>
-        /// Occurs when the power up sequence progress has changed.
-        /// </summary>
-        event EventHandler<StartPowerUpResponse> PowerUpProgress;
-
-        /// <summary>
-        /// Occurs when power up sequence has completed successfully.
-        /// </summary>
-        event EventHandler<StartPowerUpResponse> PowerUpCompleted;
-
-        /// <summary>
-        /// Occurs when power up sequence has failed.
-        /// </summary>
-        event EventHandler<StartPowerUpResponse> PowerUpFailed;
-
-        /// <summary>
-        /// Occurs when power up sequence has ended. Could be due to no response to the request!
-        /// </summary>
-        event EventHandler PowerUpEnded;
-
-        /// <summary>
-        /// Occurs when power down has started.
-        /// </summary>
-        event EventHandler<PowerDownStartedEventArgs> PowerDownStarted;
-
-        /// <summary>
-        /// Occurs when the thread loading status has changed.
-        /// </summary>
-        event EventHandler<StartThreadLoadingResponse> ThreadLoadingStatusChanged;
-
-        /// <summary>
-        /// Occurs when a thread loading confirmation is required.
+        /// Occurs when there is new diagnostics data available.
         /// </summary>
-        event EventHandler<ThreadLoadingConfirmationRequiredEventArgs> ThreadLoadingConfirmationRequired;
+        event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable;
 
         /// <summary>
-        /// Occurs when thread loading has completed.
+        /// Occurs when an events notification has been received from the embedded device.
         /// </summary>
-        event EventHandler<StartThreadLoadingResponse> ThreadLoadingCompleted;
+        event EventHandler<StartEventsNotificationResponse> EventsNotification;
 
         /// <summary>
-        /// Occurs when thread loading has failed.
+        /// Occurs when a new debug log is available.
         /// </summary>
-        event EventHandler<StartThreadLoadingResponse> ThreadLoadingFailed;
+        event EventHandler<StartDebugLogResponse> DebugLogAvailable;
 
         /// <summary>
-        /// Occurs when a head cleaning job has ended.
+        /// Occurs when machine embedded device status has changed.
         /// </summary>
-        event EventHandler<HeadCleaningEndedEventArgs> HeadCleaningEnded;
+        event EventHandler<MachineStatus> MachineStatusChanged;
 
         /// <summary>
-        /// Occurs when the ink filling status has changed.
+        /// Occurs when a new cartridge validation request has been received.
         /// </summary>
-        event EventHandler<InkFillingStatusChangedEventArgs> InkFillingStatusChanged;
+        event EventHandler<CartridgeValidationEventArgs> CartridgeValidationRequestReceived;
 
         /// <summary>
         /// Gets or sets a value indicating whether direct the embedded device to send diagnostics messages.
@@ -282,21 +209,6 @@ namespace Tango.Integration.Operation
         bool EnableMachineStatusUpdates { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether to enable automatic thread loading support.
-        /// </summary>
-        bool EnableAutomaticThreadLoading { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable the power sequence tracking.
-        /// </summary>
-        bool EnablePowerUpSequence { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to enable the ink/waste filling status channel.
-        /// </summary>
-        bool EnableInkFillingStatus { get; set; }
-
-        /// <summary>
         /// Gets the last process parameters table sent to the embedded device.
         /// </summary>
         ProcessParametersTable CurrentProcessParameters { get; }
@@ -331,6 +243,15 @@ namespace Tango.Integration.Operation
         Task<JobHandler> Print(Job job);
 
         /// <summary>
+        /// Executes a print stub for emulating a full job.
+        /// The process parameters table will be calculated using color conversion gamut region.
+        /// This method cannot accept brush stops with 'Volume' as color space.
+        /// </summary>
+        /// <param name="job">The job.</param>
+        /// <returns></returns>
+        Task<JobHandler> PrintStub(Job job);
+
+        /// <summary>
         /// Prints the specified job using the specified job parameters.
         /// </summary>
         /// <param name="job">The job.</param>
@@ -476,12 +397,6 @@ namespace Tango.Integration.Operation
         Task<StubFpgaWriteRegResponse> Reset();
 
         /// <summary>
-        /// Directs the embedded device to switch to stand-by mode.
-        /// </summary>
-        /// <returns></returns>
-        Task StandBy();
-
-        /// <summary>
         /// Resets the device through the DFU channel.
         /// </summary>
         /// <returns></returns>
@@ -491,9 +406,8 @@ namespace Tango.Integration.Operation
         /// Upgrades the firmware.
         /// </summary>
         /// <param name="tfpStream">The TFP stream (Tango Firmware Package File).</param>
-        /// <param name="isEmulated">Specify whether the connected machine is emulated and to skip the actual DFU interface.</param>
         /// <returns></returns>
-        Task<FirmwareUpgradeHandler> UpgradeFirmware(Stream tfpStream, bool isEmulated = false);
+        Task<FirmwareUpgradeHandler> UpgradeFirmware(Stream tfpStream);
 
         /// <summary>
         /// Directs the embedded device to validate the last uploaded firmware package.
@@ -519,43 +433,5 @@ namespace Tango.Integration.Operation
         /// </summary>
         /// <returns></returns>
         StorageManager CreateStorageManager();
-
-        /// <summary>
-        /// Turns off the machine.
-        /// </summary>
-        /// <returns></returns>
-        Task<PowerDownHandler> PowerDown();
-
-        /// <summary>
-        /// Starts a manual head cleaning process.
-        /// </summary>
-        /// <returns></returns>
-        Task<HeadCleaningHandler> PerformHeadCleaning();
-
-        /// <summary>
-        /// Starts the automatic thread loading process.
-        /// </summary>
-        /// <returns></returns>
-        Task StartThreadLoading();
-
-        /// <summary>
-        /// Continues the current thread loading.
-        /// </summary>
-        /// <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();
-
-        /// <summary>
-        /// Emulates a hardware event that will last for the specified timeout.
-        /// </summary>
-        /// <param name="ev">Type of the event.</param>
-        /// <param name="timeout">The timeout.</param>
-        void PushEmulatedEvent(Event ev, TimeSpan timeout);
     }
 }