Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 12 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index 0da78dc9c..06dac8fdc 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -213,21 +213,26 @@ uint32_t InitSequenceMidTankCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag
         Disable_MidTank_Pressure_Reading(portId);
         Valve_Set(IDS_Id_to_AirValve[portId], Atm_MidTank_OFF );   //Atm_MidTank_OFF/ON
         //Control3WayValvesWithCallback ((Valves_t)portId, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
-
     }
     else if (MidTankOperationCounter >= MidTankReadPressure)
     {
         //read pressure for midtank (MidTankOperationCounter-MidTankCloseAir)
         portId = MidTankOperationCounter%MAX_SYSTEM_DISPENSERS;
-        Read_MidTank_Pressure_Sensor(portId);
+        if((IfIndex==0)||(Get_MidTank_Pressure_Sensor(portId)<0.5))
+        {
+            Read_MidTank_Pressure_Sensor(portId);
+        }
     }
     else if (MidTankOperationCounter >= MidTankOpenAir)
     {
         //open air valve for midtank (MidTankOperationCounter-MidTankOpenAir)
         portId = (MidTankOperationCounter - MidTankOpenAir) ; //0-7
-        Enable_MidTank_Pressure_Reading(portId);
-        Valve_Set(IDS_Id_to_AirValve[portId], Atm_MidTank_ON );   //Atm_MidTank_OFF/ON
-        Control3WayValvesWithCallback ((Valves_t)portId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+        if((IfIndex==0)||(Get_MidTank_Pressure_Sensor(portId)<0.5))
+        {
+            Enable_MidTank_Pressure_Reading(portId);
+            Valve_Set(IDS_Id_to_AirValve[portId], Atm_MidTank_ON );   //Atm_MidTank_OFF/ON
+            Control3WayValvesWithCallback ((Valves_t)portId, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+        }
     }
     MidTankOperationCounter++;
     return OK;
@@ -544,6 +549,8 @@ uint32_t InitSequenceWaitForCoolerCallBackFunction(uint32_t IfIndex, uint32_t Bu
     }
     else
         Report("InitSequenceWaitForCoolerCallBackFunction called too late",__FILE__,__LINE__,(int)InitStages,RpWarning,(int)MachineStateDetail,0);
+    MidTankControlId = AddControlCallback("Init Midtank", InitSequenceMidTankCallBackFunction, 300/*eHundredMillisecond*/, TemplateDataReadCBFunction,1,0, 0 );
+
     return OK;
 }
 uint32_t InitSequenceWaitForCooler(void)