heaters bug - test

1 files changed, 9 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index aa9e4df4a..8302fcab6 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -94,6 +94,7 @@ char     TimeSliceAllocation[MAX_TIMESLICES] = {0xFF};
 int     DCTimeSliceAllocation[MAX_HEATERS_NUM] = {0};
 
 bool TimerActivated = false;
+char ACheatstr[100];
 
 Mailbox_Handle          HeatersControlMsgQ = NULL;
 //bool InitialHeating = true;
@@ -190,8 +191,6 @@ void LoadHeaterState(HeaterType HeaterType,HeaterState *HeaterState)
     double temp = TemperatureSensorRead(HeaterId2PT100Id[HeaterId]);
     //double temp = HeaterPreviousRead[HeaterId];//TemperatureSensorRead(HeaterId2PT100Id[HeaterId]);
 
-
-
     HeaterState->has_heatertype = true;
     HeaterState->heatertype = HeaterType;
     HeaterState->has_setpoint = true;
@@ -215,6 +214,7 @@ void LoadHeaterState(HeaterType HeaterType,HeaterState *HeaterState)
 uint32_t HeatersSingleHeaterEnd(HardwarePidControlType HeaterId)
 {
     int status = OK;
+    Report("HeatersSingleHeaterEnd ", __FILE__,__LINE__,HeaterId, RpMessage, 0, 0);
         if (HeaterId >= MAX_AC_HEATERS) //DC Heaters
         {
             if (ControlIdtoHeaterId [HeaterId]!=0xFF)
@@ -348,7 +348,7 @@ uint32_t  HeaterCommandRequestMessage(int HeaterId, bool OnOff, int Temperature)
     }
     else if ((HeaterState == HEATER_ON)&& (OnOff == HEATER_ON)) //set temperature
     {
-        if (HeaterPIDConfig[HeaterId].m_SetParam < HeaterCmd[HeaterId].targettemperatue)  //#bug 221
+        //if (HeaterPIDConfig[HeaterId].m_SetParam < HeaterCmd[HeaterId].targettemperatue)  //#bug 221
         {
             PrepareHeater(HeaterId,Temperature);  //prepare the heaters control info
         }
@@ -364,13 +364,10 @@ uint32_t  HeaterCommandRequestMessage(int HeaterId, bool OnOff, int Temperature)
        //turn off the heater
         HeatersSingleHeaterEnd(HeaterId);
     }
-    /*else //heater off, and the heater is not ready yet
-    {
-        //turn off the heater
-         HeatersSingleHeaterEnd(HeaterId);
-         //stop the control
-         HeaterPIDConfig[HeaterId].m_SetParam  = 0;
-    }*/
+
+    //usnprintf(ACheatstr, 254, "HeaterCommandRequestMessage(Id %d,OnOff %d,Temperature %d)",HeaterId,  OnOff,  Temperature);
+    Report("HeaterCommandRequestMessage",__FILE__,Temperature,HeaterId,RpWarning,HeaterState,  0);
+    //Report("HeatersSingleHeaterEnd ", __FILE__,__LINE__,HeaterId, RpMessage, 0, 0);
 
     return OK;
 }
@@ -389,6 +386,8 @@ uint32_t PrepareHeater(int HeaterId, uint32_t SetTemperatue)
         return ERROR;
     }
 
+    Report("PrepareHeater ", __FILE__,__LINE__,HeaterId, SetTemperatue, 0, 0);
+
     //start thread control for all motors
     HeaterPIDConfig[HeaterId].m_params.MAX = HeaterControl[HeaterId].outputproportionalpowerlimit*100;
     HeaterPIDConfig[HeaterId].m_params.MIN = 0.0;
@@ -656,7 +655,6 @@ uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
     }
     return ERROR;
 }
-char ACheatstr[100];
 uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
 {
     int index=MAX_HEATERS_NUM;