alarm handling improved, including fan alarms

1 files changed, 5 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index ba4749f13..59a0aee51 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -316,14 +316,15 @@ void HeadBlowersControlLoop ()
     int blowerId;
     static int count[2] = {0, 0};
 
-    ArcHeadAlarms();
-
     if (GetMachineState() < MACHINE_STATE_WAIT_FOR_COOLER)
         return; //do not start before controller is initialized and running
 
     if (!HeadBlowersEnable) {
         return;
     }
+
+    ArcHeadAlarms();
+
     for (blowerId = 0; blowerId <= 1; blowerId++) {
         if (count[blowerId] == HeadBlowersCloseLoopTime[blowerId]) {
             count[blowerId] = 0;
@@ -377,6 +378,8 @@ double PressureSensorGetPressure(uint8_t SensorId)
     V0 = PressureSensorV0[FanId];
     Vm = (double)(MillisecGetTemperatures(SensorId));
     Vm /= 10.0;
+    if ((Vm - V0 + 22)<0)
+        return 0.0;
     Q = sqrt(Vm - V0 + 22) * PRESSURE_SENSOR_CP - PRESSURE_SENSOR_B;
     return Q;
 }