prevent turning off the blower (#3166). fix ink calculation (resolves #3174, #2956, #3140, #2375) feeder start jumps (resolves #3163, #3104)

5 files changed, 30 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.c
index 31cf5d0da..57b57a41d 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/DAC/Blower.c
@@ -200,7 +200,7 @@ uint32_t Turn_the_Blower_Off()
     }
     else //new WHS
     {
-        Trigger_SetWHSBlowerVoltage(0);
+        //Trigger_SetWHSBlowerVoltage(0);
     }
     blowerStatus = false;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index bf7d761dd..30a99ac86 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -119,7 +119,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
     }
     if (saveData == true)
     {
-        if ((ProcessParams->dryerzone1temp > 0.1)&&(ProcessParams->headzone2temp > 0.1)&&(ProcessParams->headzone3temp > 0.1)&&(ProcessParams->headzone4temp > 0.1))//NOT turning off heaters
+        if ((ProcessParams->dryerzone1temp > 0.1)&&(ProcessParams->headzone2temp > 0.1)&&(ProcessParams->headzone3temp > 0.1)&&(ProcessParams->headzone1temp > 0.1))//NOT turning off heaters
         {
             Bytes = sizeof(ProcessParameters);
             FileWrite(ProcessParams,Bytes,ProcessParamsConfigPath,BIOS_WAIT_FOREVER);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 3798e9aee..7693d1520 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -347,19 +347,20 @@ void IDS_Dispenser_Content_Calculation (char DispenserId)
             != DispenserIdToMotorId[DispenserId])
         return;
 
+    /********* THIS FUNCTION IS NOW CALLED EVERY 400 MILISECONDS!!!!!!!!!! ***************************/
     //int dir = (IDS_Dispenser_Data[DispenserId].direction==1)?1:-1;
     //double consumedintimeframe = (double)(CurrentDispenserSpeed[DispenserId])*(double)(IDS_Dispenser_Data[DispenserId].microsteps)*
     //        IDS_Dispenser_Data[DispenserId].nanolitterperpulse ;//* dir;
     //double consumedintimeframe = (double)(CurrentDispenserSpeed[DispenserId]); //pulses only
     //consumedintimeframe = 10+DispenserId;
-    IDS_Dispenser_Data[DispenserId].consumedinnanolitter += (CurrentDispenserSpeed[DispenserId]/10);//100 milliseconds ==> speed/10
+    IDS_Dispenser_Data[DispenserId].consumedinnanolitter += (CurrentDispenserSpeed[DispenserId]*4/10);//100 milliseconds ==> speed/10
     if (IDS_Dispenser_Data[DispenserId].consumedinnanolitter<0)
         IDS_Dispenser_Data[DispenserId].consumedinnanolitter = 0;
     if (CurrentDispenserSpeed[DispenserId]>0.1)
     {
         DispenserDataUpdated = true;
         IDS_Dispenser_Data[DispenserId].totalconsumedinnanolitter += (CurrentDispenserSpeed[DispenserId]/10);
-        if (seconds_counter%6000 == 0)
+        if (seconds_counter%1500 == 0) //1500*400MILI = 600000
         {
             Report("IDS_Dispenser_Data ",__FILE__,DispenserId,(int)IDS_Dispenser_Data[DispenserId].consumedinnanolitter,RpWarning,(int)CurrentDispenserSpeed[DispenserId],0);
         }
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
index 7cec83bd8..dfd9ffaa5 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c
@@ -485,6 +485,7 @@ uint32_t PowerOffTurnOffCooler(void)
 uint32_t PowerOffTurnOffBlower(void)
 {
     WHS_Set_SetPoint_Q_value(0);
+    Control_Voltage_To_Blower(500);
     Turn_the_Blower_Off();//Turn off
     PowerOffMachineState++;
     return OK;
diff --git a/Software/Stubs Collection/stubs/cleaning sequence disable.cs b/Software/Stubs Collection/stubs/cleaning sequence disable.cs
new file mode 100644
index 000000000..49bf4d968
--- /dev/null
+++ b/Software/Stubs Collection/stubs/cleaning sequence disable.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Text;
+using System.Linq;
+using System.Drawing;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Tango.PMR.Stubs;
+using Tango.Stubs;
+
+public void OnExecute(StubManager stubManager)
+{
+
+//"Set WFCF Value
+ProgressRequest progressRequest = new ProgressRequest();
+progressRequest.Amount = 0xAD7;
+progressRequest.Delay = 0;
+
+var response = stubManager.Run<ProgressResponse>(progressRequest);
+
+
+}
\ No newline at end of file