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

3 files changed, 46 insertions, 43 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index de45cacaa..50c3e0b46 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -37,6 +37,7 @@
 #include "modules/heaters/heaters_ex.h"
 #include "modules/ids/ids_ex.h"
 #include "modules/waste/waste_ex.h"
+#include "modules/General/process.h"
 #include  <PMR/Diagnostics/Event.pb-c.h>
 #include  <PMR/Diagnostics/EventType.pb-c.h>
 #include  <PMR/Diagnostics/StartEventsNotificationRequest.pb-c.h>
@@ -1326,7 +1327,7 @@ uint32_t AlarmHandlingLoop(uint32_t tick)
             case ALARM_SOURCE_TYPE__MotorAlarm:
                 if (CheckMotorAlarms)
                 {
-                    if (FPGA_WD_Occurred == true)
+                    if ((FPGA_WD_Occurred == true)||(MachineReadyForHeating == false))
                     {
                         Status = false;
                     }
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index 9e5b75c83..4b3f555f4 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -235,6 +235,8 @@ return OK;
 char WasteEmptyingToken[36+1] = {0};
 uint32_t CartridgeStateUpdate(CartridgeSlot Slot,CartridgeState State)
 {
+    if (WasteEmptyingToken[0] == 0)
+        return ERROR;
     uint32_t status = NOT_SUPPORTED,i;
     MessageContainer responseContainer;
     CartridgeStatus CartridgeStatus = CARTRIDGE_STATUS__INIT;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 58a3402ee..b61201992 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -1185,35 +1185,40 @@ uint32_t HeaterBlowerMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
     }
 
     // alarm handling
-    if (HeaterPreviousRead[index] >= HeaterControl[index].sensormaxvalue)
+    if ((HeaterPreviousRead[index] >= HeaterControl[index].sensormaxvalue) && (HeaterCmd[index].targettemperatue))
     {
-        if (HeaterCmd[index].targettemperatue)
+        if(OverHeatCounter[index]++ >=Overheat_Count_Limit)
         {
-            if(OverHeatCounter[index]++ >=Overheat_Count_Limit)
+            OverHeatCounter[index] = Overheat_Count_Limit;
+            if (JobIsActive()&&(HeaterReady[index]==true))
             {
-                OverHeatCounter[index] = Overheat_Count_Limit;
-                if (JobIsActive()&&(HeaterReady[index]==true))
-                {
-                    JobEndReason = JOB_TEMPERATURE_ALARM;
-                    SendJobProgress(0.0,0,false, "Temperature Error");
-                    AbortJob("Over Temperature Error");
-                    ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0);
-                    return OK;
-                }
+                JobEndReason = JOB_TEMPERATURE_ALARM;
+                SendJobProgress(0.0,0,false, "Temperature Error");
+                AbortJob("Over Temperature Error");
+                ReportWithPackageFilter(HeatersFilter, "Temperature Error",__FILE__,__LINE__,index,RpError, 0,0);
+                return OK;
+            }
 
-                if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue))
-                {
-                    ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning,  HeaterCmd[index].targettemperatue,0);
-                }
-                else
-                {
-                    ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning,  HeaterReady[index],0);
-                    ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue,  0);
-                    AlarmHandlingSetAlarm(HeaterEventType[index], true);
-                }
+            if ((HeaterReady[index]==false)&&(HeaterPreviousRead[index]>HeaterCmd[index].targettemperatue))
+            {
+                ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, cooling off",__FILE__,index,HeaterPreviousRead[index],RpWarning,  HeaterCmd[index].targettemperatue,0);
+            }
+            else
+            {
+                ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning,  HeaterReady[index],0);
+                ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue,  0);
+                AlarmHandlingSetAlarm(HeaterEventType[index], true);
             }
         }
     }
+    else if ((HeaterPreviousRead[index] < HeaterControl[index].sensormaxvalue) && (!HeaterCmd[index].targettemperatue))
+    {
+        if(OverHeatCounter[index]++ >=Overheat_Count_Limit)
+        {
+            OverHeatCounter[index] = Overheat_Count_Limit;
+            AlarmHandlingSetAlarm(HeaterEventType[index], false);
+        }
+    }
     else if ((HeaterPreviousRead[index]) < (HeaterControl[index].sensorminvalue))
     {
         if (HeaterReady[index]==true)
@@ -1380,7 +1385,6 @@ uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
     return ERROR;
 }
 
-bool IncreaseBlower = false;
 uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
 {
     int index=HEATER_TYPE_MAX_HEATERS;
@@ -1541,30 +1545,17 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                 ReportWithPackageFilter(HeatersFilter,"AC Ready",__FILE__,index,readValue,RpWarning,(HeaterCmd[index].targettemperatue), 0);
                 HeaterAtTemp[index] = true;
                 HeaterPrepareReady();
-                IncreaseBlower = false;
             }
     }
-    if    (   (readValue >  (HeaterCmd[index].targettemperatue * ((100-HeaterControl[index].outputproportionalband+2)/100)))
-          &&  (readValue < (HeaterCmd[index].targettemperatue *  ((100+HeaterControl[index].outputproportionalband)/100))))
+    else
     {
-        if (IncreaseBlower == false)
-        {
-            IncreaseBlower = true;
-            if (BlowerCfg.enabled == true)
+        if ((readValue < (HeaterCmd[index].targettemperatue * AcHeatersLoweroperationLimit/1000))||(readValue > (HeaterCmd[index].targettemperatue * AcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
             {
-                if(Head_Type > HEAD_TYPE_FLAT_WITHOUT_CARD)
-                {
-                    WHS_Set_SetPoint_Q_value(headairflow);
-                }
-                else
-                {
-                    Turn_the_Blower_On();//Turn on with the Default_Voltage
-                    if (BlowerCfg.voltage)
-                        Control_Voltage_To_Blower(BlowerCfg.voltage);
-                }
+                //InitialHeating = false;
+                ReportWithPackageFilter(HeatersFilter,"AC NOTReady",__FILE__,index,readValue,RpWarning,(HeaterCmd[index].targettemperatue), 0);
+                HeaterAtTemp[index] = false;
+                HeaterPrepareReady();
             }
-
-        }
     }
     if(HeaterPIDConfig[index].m_isEnabled && (HeaterPIDConfig[index].m_SetParam != 0))
     {
@@ -1748,6 +1739,15 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             HeaterPrepareReady();
         }
     }
+    else
+    {
+        if ((readValue < (HeaterCmd[index].targettemperatue * DcHeatersLoweroperationLimit/1000))||(readValue > (HeaterCmd[index].targettemperatue * DcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
+            {
+                ReportWithPackageFilter(HeatersFilter,"DC NOT Ready",__FILE__,index,readValue,RpWarning,(HeaterCmd[index].targettemperatue), 0);
+                HeaterAtTemp[index] = false;
+                HeaterPrepareReady();
+            }
+    }
 
     if(HeaterPIDConfig[index].m_isEnabled && (HeaterPIDConfig[index].m_SetParam != 0))
     {