merge, no change

1 files changed, 27 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 916d33772..cb1be7fa5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -477,6 +477,11 @@ int MillisecGetTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId)
 {
     return TemperatureCalc[SensorId];
 }
+bool RapidPressureRead = false;
+void setRapidPressureRead(bool value)
+{
+    RapidPressureRead = value;
+}
 uint32_t MillisecLowLoop(uint32_t tick)
 {
     uint8_t Motor_i,Disp_i,Heater_i,temp;
@@ -528,24 +533,36 @@ uint32_t MillisecLowLoop(uint32_t tick)
                 //LOG_ERROR (1111, "Control_WD");
             }
         }
+        if (RapidPressureRead == true)
+        {
+            for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
+            {
+                CalculateDispenserPressure(Disp_i);
+                //Read_MidTank_Pressure_Sensor(Disp_i);
+            }
+            ADC_TriggerCollection();
+        }
     }
 
-    if (O900Millisecond_Tick)
+    if ((O900Millisecond_Tick)&&(RapidPressureRead == false))
     {
         ADC_TriggerCollection();
     }
     if (Onesecond_Tick)
     {
-        for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
+        if (RapidPressureRead == false)
         {
-            CalculateDispenserPressure(Disp_i);
-            //Read_MidTank_Pressure_Sensor(Disp_i);
+            for (Disp_i = 0;Disp_i < MAX_SYSTEM_DISPENSERS;Disp_i++)
+            {
+                CalculateDispenserPressure(Disp_i);
+                //Read_MidTank_Pressure_Sensor(Disp_i);
+            }
         }
         FPGA_GetAllDispensersValveBusyOCD();
         temp = Read_Fans_Tacho();
         DrawerFansStatus = temp & 0x1F;
         SystemFansStatus = temp & 0xE0;
-        KeepAliveOneSecondCall();
+        //KeepAliveOneSecondCall();
         for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++)
         {
             if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW)
@@ -553,9 +570,12 @@ uint32_t MillisecLowLoop(uint32_t tick)
             if (isMotorConfigured(Motor_i))
                 MotorGetStatusFromFPGA(Motor_i);
         }
-        for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++)
+        if (!(OneMinute_Tick))
         {
-            Read_Heaters_Current(Heater_i);
+            for (Heater_i = 0;Heater_i < NUM_OF_CURRENT_HEATERS;Heater_i++)
+            {
+                Read_Heaters_Current(Heater_i);
+            }
         }
         Gas_PPM = Calculate_Gas_Power_Consumption();
         for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)