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

3 files changed, 19 insertions, 15 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 4a43485cd..59a0aee51 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -51,10 +51,11 @@
 #define ARC_ALARM_LIMIT 3
 
 #define PRESSURE_SENSOR_CP  0.269
+#define PRESSURE_SENSOR_B   0.45
 extern uint16_t Head_Fan_Tach[2];
 extern uint8_t Head_Fan_PWM_Command[2];
 
-double      PressureSensorV0[2] = {0.0, 0.0};
+uint32_t    PressureSensorV0[2] = {0, 0};
 uint8_t     HeadBlowersCloseLoopTime[2] = {2, 2};
 uint8_t     HeadBlowersEnable = 1;
 uint8_t     BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_5_0X84_0, HEAD_PT100_ZONE_7_0X86_0}; //HEAD_FAN_RIGHT, HEAD_FAN_LEFT
@@ -315,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;
@@ -343,11 +345,12 @@ void HeadBlowersCfg()
     }
 }
 
-double PressureSensorInit(int blowerId)
+uint32_t PressureSensorInit(int blowerId)
 {
-    PressureSensorV0[blowerId] = MillisecGetTemperatures(BlowerIdToSensorId[blowerId]);
-    PressureSensorV0[blowerId] /= 10;
-    return PressureSensorV0[blowerId];
+    uint32_t V0;
+    V0 = MillisecGetTemperatures(BlowerIdToSensorId[blowerId]);
+    V0 /= 10;
+    return V0;
 }
 
 int HeadBlowersGetRPM(uint8_t blowerId)
@@ -368,15 +371,16 @@ int HeadBlowersGetPWM(uint8_t blowerId)
 
 double PressureSensorGetPressure(uint8_t SensorId)
 {
-    double V0, Vm, Q, Cp;
+    double V0, Vm, Q;
     int FanId;
 
-    Cp = PRESSURE_SENSOR_CP;
     FanId = HeadBlowerSensorIdToFanId(SensorId);
     V0 = PressureSensorV0[FanId];
     Vm = (double)(MillisecGetTemperatures(SensorId));
     Vm /= 10.0;
-    Q = sqrt(Vm - V0 + 22) * Cp;
+    if ((Vm - V0 + 22)<0)
+        return 0.0;
+    Q = sqrt(Vm - V0 + 22) * PRESSURE_SENSOR_CP - PRESSURE_SENSOR_B;
     return Q;
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
index 2c675606b..a23abf559 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
@@ -46,7 +46,7 @@ void HeatersControlStop(void);
 uint32_t Heaters_Init(void);
 double PressureSensorGetPressure(uint8_t SensorId);
 int HeadBlowersGetRPM(uint8_t fanId);
-double PressureSensorInit();
+uint32_t PressureSensorInit();
 void HeadBlowersInit();
 uint32_t HeadBlowerPidRequestMessage(void* request, int BlowerId);
 void HeadBlowersCfg();
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index e702d7072..84013add6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -560,8 +560,8 @@ uint32_t HeatersSingleHeaterEnd(int HeaterId)
             }
             DeActivateHeater(HEATER_TYPE__DryerMainHeater);
             DeActivateHeater(HEATER_TYPE__DryerSecondaryHeater);
-            //Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater]);
-            //Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerSecondaryHeater]);
+            Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater]);
+            Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerSecondaryHeater]);
             HeaterPIDConfig[HeaterId].m_SetParam = 0;
             HeaterCmd[HeaterId].targettemperatue = 0;
             HeaterReady[HeaterId] = true;
@@ -1449,8 +1449,8 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                 }
             }*/
             HeaterReady[index] = true;
-            //Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater]);
-            //Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerSecondaryHeater]);
+            Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater]);
+            Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerSecondaryHeater]);
 
         }
         return OK;