embedded paramaters stub and procedure

1 files changed, 17 insertions, 22 deletions

diff --git a/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs b/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs
index 9fa1676a6..619b76b37 100644
--- a/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs
+++ b/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs
@@ -17,11 +17,11 @@ using Tango.PMR.IO;
 
 public void OnExecute(StubManager stubManager)
 {
-
+// parameters version for TESTING 1.5.3.3
 string description = "";
 ConfigurationParameters configurationParameters = new ConfigurationParameters();
 
-description += "Version 1.5.2.3"; 
+description += "Version 1.5.3.3"; 
 configurationParameters.BreakSensorLimit = 10;
 
 //how many samples to collect in diagnostics before sending
@@ -39,7 +39,7 @@ configurationParameters.OpenValveTimeout = 20;
 configurationParameters.InitialDispenserPressure = 3.85; //used for initial pre-run maximal pressure
 configurationParameters.InitialDispenserTimeout = 120000; ////used for initial pre-run target number of steps
 configurationParameters.InitialDispenserTimeLag = 100;
-description = description+" "+configurationParameters.InitialDispenserPressure+"-"+configurationParameters.InitialDispenserTimeout;
+description = description+" "+configurationParameters.InitialDispenserPressure+"-"+configurationParameters.InitialDispenserTimeout/1000;
 
 //job prepare - build pressure in dispensers - target pressure, timoeout, time staps, speed
 configurationParameters.DispenserBuildPressureSpeed = 950; //no more than 1000
@@ -79,7 +79,7 @@ configurationParameters.IDSPreSegmentBuildupTime = 5000;
 configurationParameters.IDSCleaningSpeed = 800;
 configurationParameters.IDSCleaningStopBeforeSegmentTime = 10000;  //end of presegemnt
 configurationParameters.IDSCleaningStartSprayPreSegmentTime =2000; //beginning of presegment
-description = description+" Cl"+configurationParameters.IDSCleaningStopBeforeSegmentTime+"-"+configurationParameters.IDSCleaningStartSprayPreSegmentTime;
+description = description+" Cl"+configurationParameters.IDSCleaningStopBeforeSegmentTime/1000+"-"+configurationParameters.IDSCleaningStartSprayPreSegmentTime/1000;
 
 int Tup = 10,Tdelay1 = 98,Tdelay2 = 198; //350nsec up, 1 second delay, 2 seconds before up again
 //   Tup = LeftRockerSpeed/100;
@@ -98,6 +98,7 @@ configurationParameters.IdleHeadTemperature = 80;
 configurationParameters.IdleMixerTemperature = 0;
 configurationParameters.PowerOffTemperatureLimit = 60;
 
+
 //general parameters, ORDER MUST BE PRESERVED!!!!
 //check the dispensers hard limit alarms
 /*1*/
@@ -141,6 +142,7 @@ configurationParameters.GeneralParameters.Add(SetDiagnosticMode);
 Double SetAutoFill = new Double();
 SetAutoFill = 3.0;
 configurationParameters.GeneralParameters.Add(SetAutoFill);
+description = description+"-AF"+SetAutoFill+"DI"+SetDiagnosticMode;
 
 double PowerOffDisableCleaning = new Double();
 PowerOffDisableCleaning = 0.0;
@@ -162,10 +164,15 @@ double Voltage_Hysteresis = new Double();
 Voltage_Hysteresis = 4;
 configurationParameters.GeneralParameters.Add(Voltage_Hysteresis);
 
+configurationParameters.Description = description;
+//stubManager.Write("\n\n"+description);
+stubManager.Write("\n\n"+configurationParameters.Description+"\n\n");
+
 
 File.WriteAllBytes("C:/temp/EmbParam.cfg",configurationParameters.ToBytes());
 
-byte[] fileBytes = File.ReadAllBytes("C:/temp/EmbParam.cfg");
+
+byte[] fileBytes = configurationParameters.ToBytes();
 
 
 var config = ConfigurationParameters.Parser.ParseFrom(fileBytes);
@@ -192,20 +199,11 @@ FileUploadResponse response2 = stubManager.Run<FileUploadResponse>(fileUploadReq
 Thread.Sleep(1000);
 long chunk_size = response2.MaxChunkLength;
 
-FileStream fs = new FileStream("C:/temp/EmbParam.cfg",FileMode.Open);
-
-while (fs.Position < fs.Length)
-{
-		stubManager.Write("Position "+ fs.Position+ " Length "+ fs.Length +"\n\n");
-		FileChunkUploadRequest fileChunkUploadRequest = new FileChunkUploadRequest();
-		fileChunkUploadRequest.UploadID = response2.UploadID;
-		byte[] chunk = new byte[Math.Min(chunk_size,fs.Length - fs.Position)];
-		fs.Read(chunk,0,chunk.Length);
-		fileChunkUploadRequest.Buffer = ByteString.CopyFrom(chunk);	
-		var response3 = stubManager.Run<FileChunkUploadResponse>(fileChunkUploadRequest);
-		Thread.Sleep(2000);
-
-}
+stubManager.Write("Chunk size "+ chunk_size + " file size "+ fileBytes.Length +"\n\n");
+FileChunkUploadRequest fileChunkUploadRequest = new FileChunkUploadRequest();
+fileChunkUploadRequest.UploadID = response2.UploadID;
+fileChunkUploadRequest.Buffer = ByteString.CopyFrom(fileBytes);	
+var response3 = stubManager.Run<FileChunkUploadResponse>(fileChunkUploadRequest);
 
 // activating the new file
 ProgressRequest progressRequest = new ProgressRequest();
@@ -214,9 +212,6 @@ progressRequest.Delay = 0xCD;
 var response1 = stubManager.Run<ProgressResponse>(progressRequest);
 
 
-/*
-13:46:42.38: Executing script 'embeddedparametersbuild.cs'...
-{ "BreakSensorLimit": 10, "DiagnosticCollectionLimit": 1, "OverHeatCountLimit": 3, "UnderHeatCountLimit": 3, "CloseValveTimeout": 255, "OpenValveTimeout": 255, "InitialDispenserPressure": 1.5, "InitialDispenserTimeout": 60000, "InitialDispenserTimeLag": 100, "DispenserBuildPressureSpeed": 800, "DispenserBuildPressureLimit": 0.9, "DispenserBuildPressureTimeout": 80000, "DispenserBuildPressureLag": 50, "ACHeatersLowerOperationLimit": 995, "ACHeatersUpperOperationLimit": 1005, "DCHeatersLowerOperationLimit": 978, "DCHeatersUpperOperationLimit": 1005, "DispenserPresegmentWFCF": 80, "StartHeatingOnInitSequence": true, "GeneralParameters": [ 1, 1, 1, 1, 800, 1000 ], "CurrentAlarmLowLimit": 0.8, "CurrentAlarmHighLimit": 1.07, "IDSSegmentRefillTimeout": 5000, "IDSPreSegmentBuildupTime": 5000, "IDSCleaningSpeed": 50, "IDSCleaningStopBeforeSegmentTime": 3000, "IDSCleaningStartSprayPreSegmentTime": 1000, "IDSLeftCleaningMotorSpeed": 30, "IDSRightCleaningMotorSpeed": 23, "SwitchToIdleTimeinSeconds": 3600, "IdleDrierTemperature": 80, "IdleHeadTemperature": 80, "PowerOffTemperatureLimit": 50, "IDSPreSegmentWFCFTimeBeforeSegment": 1500 } */
 
 
 }
\ No newline at end of file