warnings

5 files changed, 86 insertions, 29 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index f5c9c09b5..e0f7bb898 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -111,7 +111,7 @@ bool Validate_Valve(Valves_t Valve_Id)
     return true;
 }
 bool IgnoreMidTank = false;
-#ifdef 0
+#ifdef MIDTANK_MITIGATION
 bool MidTankMitigation = false;
 int MidTankMitigationOn = 20,MidTankMitigationOff = 10;
 uint32_t MidtankMitigationControlId[NUM_OF_VALVES] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
@@ -422,7 +422,7 @@ void Valve_Set(Valves_t Valve_Id, bool Direction)
             Report("Mid Tank Valve command ignored - bypass",__FILE__,__LINE__,(int)Valve_Id,RpWarning,Direction,0);
             return;
         }
-#ifdef 0
+#ifdef MIDTANK_MITIGATION
         if (MidTankMitigation == true)
         {
             Report("Mid Tank Valve command mitigation",__FILE__,Valve_Id,(int)Valve_Id,RpWarning,Direction,0);
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index 4b3f555f4..f04483361 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -237,7 +237,7 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State)
 {
     if (WasteEmptyingToken[0] == 0)
         return ERROR;
-    uint32_t status = NOT_SUPPORTED,i;
+    uint32_t status = NOT_SUPPORTED;
     MessageContainer responseContainer;
     CartridgeStatus CartridgeStatus = CARTRIDGE_STATUS__INIT;
     Cartridge CartData = CARTRIDGE__INIT;
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index ed5f5e560..a3b8b7272 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -1241,7 +1241,7 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.progress = request->delay;
         response.has_progress = true;
     }
-#ifdef 0
+#ifdef MIDTANK_MITIGATION
     else
     if(request->amount == 0xC12)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
index 9f99ec558..63c7b6963 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
@@ -23,7 +23,7 @@
 
 void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
 {
-    uint32_t status = PASSED;
+    //uint32_t status = PASSED;
     MessageContainer responseContainer;
 
     static bool first_time = true;
@@ -82,7 +82,7 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
 
 void Stub_CartridgeWriteRequest(MessageContainer* requestContainer)
 {
-    uint32_t status = NOT_SUPPORTED;
+    //uint32_t status = NOT_SUPPORTED;
     MessageContainer responseContainer;
 
     StubCartridgeWriteRequest* request = stub_cartridge_write_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
diff --git a/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs b/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs
index 3b2ff042b..d0d78f61e 100644
--- a/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs
+++ b/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs
@@ -24,26 +24,26 @@ ConfigurationParameters configurationParameters = new ConfigurationParameters();
 configurationParameters.BreakSensorLimit = 10;
 
 //how many samples to collect in diagnostics before sending
-configurationParameters.DiagnosticCollectionLimit = 1;
+configurationParameters.DiagnosticCollectionLimit = 3;
 
 //how many consecutive readout before declaring DC over/underheat alarm
 configurationParameters.OverHeatCountLimit = 3;
 configurationParameters.UnderHeatCountLimit = 3;
 
 // time of motor activity before opening the valve or after closing the valve, in milliseconds
-configurationParameters.CloseValveTimeout = 10;
-configurationParameters.OpenValveTimeout = 10;
+configurationParameters.CloseValveTimeout = 20;
+configurationParameters.OpenValveTimeout = 20;
 
 //backlash after filling - target pressure, timoeout, time staps (speed will be added in general parameters)
-configurationParameters.InitialDispenserPressure = 0.25; 
-configurationParameters.InitialDispenserTimeout = 60000; //20 seconds
+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;
 
 //job prepare - build pressure in dispensers - target pressure, timoeout, time staps, speed
 configurationParameters.DispenserBuildPressureSpeed = 950; //no more than 1000
-configurationParameters.DispenserBuildPressureLimit = 1.2; 
-configurationParameters.DispenserBuildPressureTimeout = 80000;
-configurationParameters.DispenserBuildPressureLag = 50;
+configurationParameters.DispenserBuildPressureLimit = 0.85; 
+configurationParameters.DispenserBuildPressureTimeout = 420000; // 7 minutes - long prepare for 5 cycles build
+configurationParameters.DispenserBuildPressureLag = 100;
 
 //temperature band 1000 = 100% - thresholds for job start around target temprature - AC
 configurationParameters.ACHeatersLowerOperationLimit = 995;
@@ -59,46 +59,56 @@ configurationParameters.MidTankPressureCorrection = 0.0;
 //waste factor for intersegment pressure building
 configurationParameters.DispenserPresegmentWFCF = 40;
 //how much time to start the WFCF process (pressure buildup) before segment start
-configurationParameters.IDSPreSegmentWFCFTimeBeforeSegment = 30000;
+configurationParameters.IDSPreSegmentWFCFTimeBeforeSegment = 12000;
 
 //flag: start heaters according to saved process parameters upon init?
-configurationParameters.StartHeatingOnInitSequence = false;
+configurationParameters.StartHeatingOnInitSequence = true;
 
 // current test for the heaters - alarm thresholds
-configurationParameters.CurrentAlarmLowLimit = 0.80;
+configurationParameters.CurrentAlarmLowLimit = 0.78;
 configurationParameters.CurrentAlarmHighLimit = 1.07;
 
+//currently not in use
 configurationParameters.IDSSegmentRefillTimeout = 5000;
 configurationParameters.IDSPreSegmentBuildupTime = 5000;
 //cleaning!!!!!!!!!!
 configurationParameters.IDSCleaningSpeed = 800;
-configurationParameters.IDSCleaningStopBeforeSegmentTime = 3000;
-configurationParameters.IDSCleaningStartSprayPreSegmentTime = 1000;
+configurationParameters.IDSCleaningStopBeforeSegmentTime = 10000;  //end of presegemnt
+configurationParameters.IDSCleaningStartSprayPreSegmentTime =2000; //beginning of presegment
+
+int Tup = 10,Tdelay1 = 98,Tdelay2 = 198; //350nsec up, 1 second delay, 2 seconds before up again
+//   Tup = LeftRockerSpeed/100;
+//    Tdelay1 = LeftRockerSpeed%100;
+//    Tdelay2 = RightRockerSpeed;
+int LeftRockerSpeed = Tup*100+Tdelay1;
+int RightRockerSpeed = Tdelay2;
+
+configurationParameters.IDSLeftCleaningMotorSpeed = LeftRockerSpeed;
+configurationParameters.IDSRightCleaningMotorSpeed = RightRockerSpeed;
 
-configurationParameters.IDSLeftCleaningMotorSpeed = 30;
-configurationParameters.IDSRightCleaningMotorSpeed = 23;
 configurationParameters.SwitchToIdleTimeinSeconds = 3600;
 configurationParameters.IdleDrierTemperature = 80;
 configurationParameters.IdleHeadTemperature = 80;
 configurationParameters.IdleMixerTemperature = 0;
-configurationParameters.PowerOffTemperatureLimit = 50;
+configurationParameters.PowerOffTemperatureLimit = 60;
 
 //general parameters, ORDER MUST BE PRESERVED!!!!
 //check the dispensers hard limit alarms
 /*1*/
 Double checkHardLimitAlarms = new Double();
+
 checkHardLimitAlarms = 1.0;
 configurationParameters.GeneralParameters.Add(checkHardLimitAlarms);
 
 /*2*/
 Double checkCurrentAlarms = new Double();
-checkCurrentAlarms = 1.0;
+checkCurrentAlarms = 0.0;
 configurationParameters.GeneralParameters.Add(checkCurrentAlarms);
 //check the tamper alarms
 
 /*3*/
 Double checkTamperAlarms = new Double();
-checkTamperAlarms = 0.0;
+checkTamperAlarms = 1.0;
 configurationParameters.GeneralParameters.Add(checkTamperAlarms);
 
 /*4*/
@@ -108,24 +118,29 @@ configurationParameters.GeneralParameters.Add(checkMotorAlarms);
 
 /*5*/
 Double WinderBackToBaseTime = new Double();
-WinderBackToBaseTime = 800.0;
+WinderBackToBaseTime = 820.0;
 configurationParameters.GeneralParameters.Add(WinderBackToBaseTime);
 
 /*6*/
 Double DispenserInitialPressureSpeed = new Double();
-DispenserInitialPressureSpeed = 800.0;
+DispenserInitialPressureSpeed = 1050.0;
 configurationParameters.GeneralParameters.Add(DispenserInitialPressureSpeed);
 
 /*7*/
 Double SetDiagnosticMode = new Double();
-SetDiagnosticMode = 1.0;
+SetDiagnosticMode = 3.0;
 configurationParameters.GeneralParameters.Add(SetDiagnosticMode);
 
 /*8*/
 Double SetAutoFill = new Double();
-SetAutoFill = 0.0;
+SetAutoFill = 3.0;
 configurationParameters.GeneralParameters.Add(SetAutoFill);
 
+double PowerOffDisableCleaning = new Double();
+PowerOffDisableCleaning = 0.0
+configurationParameters.GeneralParameters.Add(PowerOffDisableCleaning);
+
+
 File.WriteAllBytes("C:/temp/EmbParam.cfg",configurationParameters.ToBytes());
 
 byte[] fileBytes = File.ReadAllBytes("C:/temp/EmbParam.cfg");
@@ -133,7 +148,49 @@ byte[] fileBytes = File.ReadAllBytes("C:/temp/EmbParam.cfg");
 
 var config = ConfigurationParameters.Parser.ParseFrom(fileBytes);
 
-	stubManager.Write( config);
+stubManager.Write( config);
+Thread.Sleep(1000);
+
+
+stubManager.Write("\n\n Deleting old file");
+
+DeleteRequest deleteRequest = new DeleteRequest();
+deleteRequest.Path = "SYSINFO//EmbParam.cfg";
+deleteRequest.Attribute = Tango.PMR.IO.FileAttribute.Unspecified;
+DeleteResponse response5 = stubManager.Run<DeleteResponse>(deleteRequest);
+
+
+Thread.Sleep(1000);
+stubManager.Write("\n\n Loading new file file");
+
+FileUploadRequest fileUploadRequest = new FileUploadRequest();
+fileUploadRequest.Path = "SYSINFO//EmbParam.cfg";
+fileUploadRequest.Length = (int)fileBytes.Length;
+FileUploadResponse response2 = stubManager.Run<FileUploadResponse>(fileUploadRequest);
+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);
+
+}
+
+// activating the new file
+ProgressRequest progressRequest = new ProgressRequest();
+progressRequest.Amount = 0xCD;
+progressRequest.Delay = 0xCD;
+var response1 = stubManager.Run<ProgressResponse>(progressRequest);
+
 
 /*
 13:46:42.38: Executing script 'embeddedparametersbuild.cs'...