diff options
Diffstat (limited to 'Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs')
| -rw-r--r-- | Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 5bece20cd..fed6825f3 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -3278,26 +3278,26 @@ namespace Tango.Integration.Operation { LogManager.Log("Job Resume Detected..."); - resumePreProgress = config.ResumeConfig.GlobalStartPosition - config.ResumeConfig.FirstUnitStartPosition;//- processParameters.DryerBufferLengthMeters; + resumePreProgress = config.ResumeConfig.GlobalStartPosition;// - config.ResumeConfig.FirstUnitStartPosition;//- processParameters.DryerBufferLengthMeters; - request.FirstUnitStartPosition = config.ResumeConfig.FirstUnitStartPosition + processParameters.DryerBufferLengthMeters; + request.FirstUnitStartPosition = config.ResumeConfig.GlobalStartPosition; //LogManager.Log($" resumePreProgress = {resumePreProgress}, GlobalStartPosition {config.ResumeConfig.GlobalStartPosition} FirstUnitStartPosition {request.FirstUnitStartPosition}"); request.JobTicket.Length = (request.JobTicket.Length / Math.Max(request.JobTicket.NumberOfUnits, 1)) * (int)Math.Max(config.ResumeConfig.RemainingUnits, 1); request.JobTicket.NumberOfUnits = (uint)Math.Max(config.ResumeConfig.RemainingUnits, 1); - - LogManager.Log($"Resume Config:\n{config.ResumeConfig.ToJsonString()}\n\nAppended Progress: {resumePreProgress}\n\nSent To Firmware:\nJob Length: {request.JobTicket.Length}\nNumber Of Units: {request.JobTicket.NumberOfUnits}\nFirst Unit Start Position: {request.FirstUnitStartPosition}"); + + LogManager.Log($"Resume Config:\n{config.ResumeConfig.ToJsonString()}\n"); } SendContinuousRequest<JobRequest, JobResponse>(request, new TransportContinuousRequestConfig() { Timeout = TimeSpan.FromSeconds(10), ContinuousTimeout = TimeSpan.FromSeconds(10), ShouldLog = true }).Subscribe((response) => { if (!completed) { - if (resumePreProgress > 0 && response.Message.Status.Progress > 0) - { - LogManager.Log($"Appending Resume Progress {resumePreProgress} + {response.Message.Status.Progress}", LogCategory.Debug); - response.Message.Status.Progress += resumePreProgress; - } + //if (resumePreProgress > 0 && response.Message.Status.Progress > 0) + //{ + // //LogManager.Log($"Appending Resume Progress {resumePreProgress} + {response.Message.Status.Progress}", LogCategory.Debug); + // //response.Message.Status.Progress += resumePreProgress; + //} handler.RaiseStatusReceived(response.Message.Status); _last_job_status = handler.Status; |