mostly stubs unification

1 files changed, 44 insertions, 26 deletions

diff --git a/Software/Stubs Collection/stubs/JobRequest.cs b/Software/Stubs Collection/stubs/JobRequest.cs
index 7e0f0b376..4da47d86f 100644
--- a/Software/Stubs Collection/stubs/JobRequest.cs
+++ b/Software/Stubs Collection/stubs/JobRequest.cs
@@ -14,8 +14,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using Tango.PMR.Printing;
+using Tango.PMR.Diagnostics;
 using Tango.PMR.Stubs;
-using Tango.Stubs.UI;
+using Tango.Stubs;
 
 public void OnExecute(StubManager stubManager)
 {
@@ -38,16 +39,20 @@ jobTicket.InterSegmentLength = 50;
 jobTicket.Length = 1000;
 
 ProcessParameters processParameters = new ProcessParameters();
-processParameters.DyeingSpeed = 50;
-processParameters.MixerTemp = 60;
+//        SPEEED
+processParameters.DyeingSpeed = 20;
+//        HEAT
+processParameters.DryerZone1Temp = 100;
+
+
+processParameters.MixerTemp = 0;
 processParameters.DryerBufferLength = 20;
 processParameters.MinInkUptake = 0;
-processParameters.HeadZone1Temp = 40;
-processParameters.HeadZone2Temp = 40;
-processParameters.HeadZone3Temp = 40;
-processParameters.DryerZone1Temp = 40;
-processParameters.DryerZone2Temp = 40;
-processParameters.DryerZone3Temp = 40;
+processParameters.HeadZone1Temp = 0;
+processParameters.HeadZone2Temp = 0;
+processParameters.HeadZone3Temp = 0;
+processParameters.DryerZone2Temp = 0;
+processParameters.DryerZone3Temp = 0;
 processParameters.FeederTension = 0;
 processParameters.PullerTension = 0;
 processParameters.WinderTension = 0;
@@ -63,17 +68,18 @@ jobSpool.JobSpoolType = Tango.PMR.Printing.JobSpoolType.StandardSpool;
 jobSpool.Length = 800;
 jobSpool.Weight = 0;
 jobSpool.Diameter = 3.0;
-jobSpool.StartOffsetPulses = 600;
+jobSpool.StartOffsetPulses = 250;
 jobSpool.BackingRate = 10;
-jobSpool.SegmentOffsetPulses = 500;
+jobSpool.SegmentOffsetPulses = 750;
 jobSpool.BottomBackingRate = 70;
-jobSpool.RotationsPerPassage = 7;
+jobSpool.RotationsPerPassage = 3;
 
 jobTicket.Spool = jobSpool;
 
 JobSegment jobSegment = new JobSegment();
 jobSegment.Name = "Segment1";
-jobSegment.Length = 20.0;
+//         LENGTH
+jobSegment.Length = 30.0;
 
 JobBrushStop jobBrushStop = new JobBrushStop();
 jobBrushStop.Index = 0;
@@ -81,15 +87,15 @@ jobBrushStop.OffsetPercent = 0;
 jobBrushStop.OffsetMeters = 0;
 
 JobDispenser jobDispenser = new JobDispenser();
-jobDispenser.Index = 2;
+jobDispenser.Index = 6;
 jobDispenser.Volume = 10;
 jobDispenser.DispenserStepDivision = Tango.PMR.Printing.DispenserStepDivision.Auto;
-jobDispenser.NanolitterPerSecond = 10;
+jobDispenser.NanolitterPerSecond = 500;
 jobDispenser.NanoliterPerCentimeter = 10;
-jobDispenser.PulsePerSecond = 500;
+jobDispenser.PulsePerSecond = 0;
 jobDispenser.DispenserLiquidType = Tango.PMR.Printing.DispenserLiquidType.Cyan;
 jobDispenser.LiquidMaxNanoliterPerCentimeter = 40;
-jobDispenser.NanoliterPerPulse = 10;
+jobDispenser.NanoliterPerPulse = 2.4;
 jobBrushStop.Dispensers.Add(jobDispenser);
 jobSegment.BrushStops.Add(jobBrushStop);
 jobTicket.Segments.Add(jobSegment);
@@ -97,13 +103,13 @@ jobTicket.Segments.Add(jobSegment);
 jobRequest.JobTicket = jobTicket;
 
 
-//	var response = stubManager.Run<JobResponse>(jobRequest);
+	var response = stubManager.Run<JobResponse>(jobRequest);
 	int i=0;
-stubManager.WriteLine("data.data length = " + jobRequest.CalculateSize());
-	
+/*stubManager.WriteLine("data.data length = " + jobRequest.CalculateSize());
+*/	
 stubManager.RunContinuous<JobResponse>(jobRequest,(response1) =>
                                                    {                                                   	
-				stubManager.WriteLine (String.Format("Data, {0},  %{1}, Segment {2}",++i,response1.Status.Progress*100,response1.Status.CurrentSegmentIndex));
+				stubManager.WriteLine (String.Format("Data, {0},  {1} meters, {2}",++i,response1.Status.Progress*jobSegment.Length,response1.Status.Message));
                                                    	
                                                    });
 /*	    stubManager.RunContinuous<ProgressResponse>(request, (response) =>
@@ -113,13 +119,25 @@ stubManager.RunContinuous<JobResponse>(jobRequest,(response1) =>
 
     });
 */
-/*	
-	int i=0;
-stubManager.RunContinuous<StubHeatingTestPollResponse>("StubHeatingTestPollRequest",(response1) => 
+	
+	//int i=0;
+/*stubManager.RunContinuous<StubHeatingTestPollResponse>("StubHeatingTestPollRequest",(response1) => 
                                                    {                                                   	
 //				stubManager.WriteLine (String.Format("Data, {0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}",++i,response1.Zone1Temp,response1.Zone2Temp,response1.Heater1Active,response1.Heater2Active,response1.Heater1Percentage,response1.Heater2Percentage,response1.InfoMessage));
-				stubManager.WriteLine (String.Format("Data, {0}, {1}, {2}, {3}, {4}, {5}",++i,response1.Zone1Temp,response1.Zone2Temp,response1.Heater1Percentage,response1.Heater2Percentage,response1.InfoMessage));
+				stubManager.WriteLine (String.Format("Data, Id {0}, Id {1}, Temp {2}, % {3}, Active {4}, {5}",++i,response1.Zone1Temp,response1.Zone2Temp,response1.Heater1Percentage,response1.Heater1Active,response1.InfoMessage));
+                                                   	
+                                                   },0);
+
+
+/*StartDiagnosticsRequest startDiagnosticsRequest = new StartDiagnosticsRequest();
+//stubManager.RunContinuous<StartDiagnosticsResponse>(startDiagnosticsRequest,(response1) =>
+stubManager.RunContinuous<StartDiagnosticsResponse>(startDiagnosticsRequest,(response1)    =>
+                                                   {                                                   	
+				stubManager.WriteLine (String.Format("Data, {0}, H1 {1}, H2{2}, H3 {3}, D1 {4}, D2 {5}",++i,response1.Monitors.HeadZone1Temperature[0],response1.Monitors.HeadZone2Temperature[0],response1.Monitors.HeadZone3Temperature[0],response1.Monitors.DryerZone1Temperature[0],response1.Monitors.DryerZone2Temperature[0]));
+				stubManager.WriteLine (String.Format("Data, {0}, DR {1}, DM{2}, DL {3}, Feeder {4}",++i,response1.Monitors.Dancer1Angle[0],response1.Monitors.Dancer2Angle[0],response1.Monitors.Dancer3Angle[0],response1.Monitors.FeederMotorFrequency[0]));
                                                    	
                                                    },0);
+
 */
-}
\ No newline at end of file
+}
+