From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Embedded/Modules/Heaters/Heaters_Blowers.c     | 22 ++++++++++++----------
 .../Embedded/Modules/Heaters/Heaters_ex.h          |  2 ++
 .../Embedded/Modules/Heaters/Heaters_print.c       | 21 +++++++++++++++++++++
 3 files changed, 35 insertions(+), 10 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Heaters')

diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 76c679d80..ed3ae9bab 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -228,16 +228,7 @@ void setArcHeadAlarms(uint32_t AlarmId, bool value)
     {
         switch(AlarmId)
         {
-            case EVENT_TYPE__DYEING_HEAD_COVER_IS_OPEN:
-                ReportWithPackageFilter(HeatersFilter,"FlatHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
-                break;
-            /*case EVENT_TYPE__DYEING_HEAD_ARC_LID_IS_OPEN:
-                ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
-                break;
-            case EVENT_TYPE__DYEING_HEAD_TUNNEL_LID_IS_OPEN:
-                ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
-                break;
-            case EVENT_TYPE__DYEING_HEAD_BLOWER_1_FAN_STOPPED:
+            /*case EVENT_TYPE__DYEING_HEAD_BLOWER_1_FAN_STOPPED:
                 ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
                 break;
             case EVENT_TYPE__DYEING_HEAD_BLOWER_2_FAN_STOPPED:
@@ -261,6 +252,17 @@ void setArcHeadAlarms(uint32_t AlarmId, bool value)
             case EVENT_TYPE__DYEING_HEAD_BLOWER_2_FLOW_TOO_LOW:
                 ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count8,RpError, PressureSensorGetPressure(HEAD_FAN_LEFT),0);
                 break;
+                /*case EVENT_TYPE__DYEING_HEAD_ARC_LID_IS_OPEN:
+                    ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
+                    break;
+                case EVENT_TYPE__DYEING_HEAD_TUNNEL_LID_IS_OPEN:
+                    ReportWithPackageFilter(HeatersFilter,"ArcHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
+                    break;*/
+            case EVENT_TYPE__DYEING_HEAD_COVER_IS_OPEN:
+                ReportWithPackageFilter(HeatersFilter,"FlatHeadAlarms on",__FILE__,AlarmId,count9,RpError, 0,0);
+                break;
+            default:
+                break;
         }
     }
 }
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
index 7c11b12bf..7e3f6252f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
@@ -40,6 +40,8 @@ void Heaters_SetOverHeatTimeOutValues(uint32_t OverHeatTimeout, uint32_t UnderHe
 void  Heaters_SetOperationLimits(int acheatersloweroperationlimit,int acheatersupperoperationlimit,int dcheatersloweroperationlimit,int dcheatersupperoperationlimit);
 
 uint32_t DrierHeaterVoltageSetup(void);
+//this function returns preparation ratio for the most cool heater (current temperature/ target temerature)
+double HeatersPrepareProgress(void);
 
 uint32_t HeatersEnd(void);
 void HeatersControlStart(void);
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index db7261090..f7fb7119c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -574,6 +574,27 @@ uint32_t HeatersSingleHeaterEnd(int HeaterId)
     return status;
 
 }
+//this function returns preparation ratio for the most cool heater (current temperature/ target temerature)
+double HeatersPrepareProgress(void)
+{
+    HardwarePidControlType i;
+    double MaxDifference = 1.00,temp = 0;
+    for (i=0;i<HEATER_TYPE_MAX_HEATERS;i++)
+    {
+        if(HeaterCmd[i].targettemperatue)
+        {
+            if (MillisecGetTemperatures(HeaterId2PT100Id[i])>=HeaterCmd[i].targettemperatue)
+                continue;
+            temp = (double)(MillisecGetTemperatures(HeaterId2PT100Id[i]))/(double)(HeaterCmd[i].targettemperatue);
+            if (temp<MaxDifference)
+                MaxDifference = temp;
+        }
+    }
+    //Report("HeatersPrepareProgress" ,__FILE__,__LINE__,(int)(MaxDifference*100),RpWarning,0,0);
+
+    return MaxDifference;
+
+}
 
 
 uint32_t HeatersEnd(void)
-- 
cgit v1.3.1