heaters pid rethinking - not compiling!

1 files changed, 10 insertions, 8 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 0ac355910..c9b704aa3 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -888,7 +888,8 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             }
         }
         */
-        if ((readValue > (HeaterCmd[index].targettemperatue * AcHeatersLoweroperationLimit/1000))&&(readValue < (HeaterCmd[index].targettemperatue * AcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
+//        if ((readValue > (HeaterCmd[index].targettemperatue * AcHeatersLoweroperationLimit/1000))&&(readValue < (HeaterCmd[index].targettemperatue * AcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
+        if ((readValue > (HeaterCmd[index].targettemperatue *  (100-HeaterControl[index].outputproportionalband))/100)&&(readValue < (HeaterCmd[index].targettemperatue *  (100+HeaterControl[index].outputproportionalband))/100))//read value within 0.5 percent from target
         {
 //////////////////
             //InitialHeating = false;
@@ -917,7 +918,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
     if(HeaterPIDConfig[index].m_isEnabled && (HeaterPIDConfig[index].m_SetParam != 0))
     {
         HeaterPIDConfig[index].m_mesuredParam = readValue;
-        if (HeaterControl[index].pidactive == false)
+        /*if (HeaterControl[index].pidactive == false)
         {
             if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100)) //below proportional band
             {
@@ -930,7 +931,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                 //REPORT_MSG (readValue,"AC HEATER Under temperature");
             }
         }
-        else  //PID active
+        else  //PID active*/
         {
             if ((readValue > ((HeaterCmd[index].targettemperatue * (100+HeaterControl[index].outputproportionalband))/100)))
             {
@@ -956,7 +957,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                     HeaterPIDConfig[index].m_calculatedError = AdvancedPIDAlgorithmCalculation(HeaterPIDConfig[index].m_SetParam , HeaterPIDConfig[index].m_mesuredParam,
                                                           &HeaterPIDConfig[index].m_params,   &HeaterPIDConfig[index].m_preError, &HeaterPIDConfig[index].m_integral);
                 }
-            }
+            //}
 //            len = usnprintf(ACheatstr, 254, "ACD Id, Temp , Integral, Output{ %d, %d ,%d, %d} ",index,(int)HeaterPIDConfig[index].m_mesuredParam ,(int)HeaterPIDConfig[index].m_integral,(int)HeaterPIDConfig[index].m_calculatedError);
             //        Report(logmsg[index],__FILE__,__LINE__,index,RpWarning,index,  Counter[index]);
             //        #warning PID is now only proportional (above)
@@ -1049,7 +1050,8 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                     return OK;
                 }
 
-        if ((readValue > (HeaterCmd[index].targettemperatue * DcHeatersLoweroperationLimit/1000))&&(readValue < (HeaterCmd[index].targettemperatue * DcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
+        //if ((readValue > (HeaterCmd[index].targettemperatue * DcHeatersLoweroperationLimit/1000))&&(readValue < (HeaterCmd[index].targettemperatue * DcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
+        if ((readValue > (HeaterCmd[index].targettemperatue *  (100-HeaterControl[index].outputproportionalband))/100)&&(readValue < (HeaterCmd[index].targettemperatue *  (100+HeaterControl[index].outputproportionalband))/100))//read value within 0.5 percent from target
         {
             Report("DC PID Activating",__FILE__,index,readValue,RpWarning,(HeaterCmd[index].targettemperatue), 0);
             //DCInitialHeating[index] = false;
@@ -1064,7 +1066,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
 
     if(HeaterPIDConfig[index].m_isEnabled && (HeaterPIDConfig[index].m_SetParam != 0))
     {
-        if (HeaterControl[index].pidactive == false)
+        /*if (HeaterControl[index].pidactive == false)
         {
             if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100)) //below proportional band
             {
@@ -1076,7 +1078,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             }
 
         }
-        else ///pid active
+        else ///pid active*/
         {
             //check only for the proportional band limits
             HeaterPIDConfig[index].m_mesuredParam = readValue;
@@ -1120,7 +1122,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             }
             HeaterRecalculateHeaterParams(index, (int)(HeaterPIDConfig[index].m_calculatedError/100));
 
-        }
+        //}
 
     }