MERGE

1 files changed, 11 insertions, 11 deletions

diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
index 7d42ad8f5..2db4474f7 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c
@@ -36,17 +36,17 @@ void PowerIdleSetIdle(void)
 {
     memcpy (&ActiveProcessParameters,&ProcessParametersKeep,sizeof(ProcessParameters));
     ProcessParameters ProcessParametersClear;
-    ProcessParametersClear.dryerzone1temp = 80;
-    ProcessParametersClear.dryerzone2temp = 80;
-    ProcessParametersClear.dryerzone3temp = 80;
-    ProcessParametersClear.mixertemp      = 0;
-    ProcessParametersClear.headzone1temp  = 80;
-    ProcessParametersClear.headzone2temp  = 80;
-    ProcessParametersClear.headzone3temp  = 80;
-    ProcessParametersClear.headzone4temp  = 80;
-    ProcessParametersClear.headzone5temp  = 80;
-    ProcessParametersClear.headzone6temp  = 80;
-    ProcessParametersClear.dyeingspeed = 40;
+    ProcessParametersClear.dryerzone1temp = (ActiveProcessParameters.dryerzone1temp<80)? ActiveProcessParameters.dryerzone1temp:80;
+    ProcessParametersClear.dryerzone2temp = (ActiveProcessParameters.dryerzone2temp<80)? ActiveProcessParameters.dryerzone2temp:80;
+    ProcessParametersClear.dryerzone3temp = (ActiveProcessParameters.dryerzone3temp<80)? ActiveProcessParameters.dryerzone3temp:80;
+    ProcessParametersClear.mixertemp      = (ActiveProcessParameters.mixertemp     <80)? ActiveProcessParameters.mixertemp     :80;
+    ProcessParametersClear.headzone1temp  = (ActiveProcessParameters.headzone1temp <80)? ActiveProcessParameters.headzone1temp  :80;
+    ProcessParametersClear.headzone2temp  = (ActiveProcessParameters.headzone2temp <80)? ActiveProcessParameters.headzone2temp  :80;
+    ProcessParametersClear.headzone3temp  = (ActiveProcessParameters.headzone3temp <80)? ActiveProcessParameters.headzone3temp  :80;
+    ProcessParametersClear.headzone4temp  = (ActiveProcessParameters.headzone4temp <80)? ActiveProcessParameters.headzone4temp  :80;
+    ProcessParametersClear.headzone5temp  = (ActiveProcessParameters.headzone5temp <80)? ActiveProcessParameters.headzone5temp  :80;
+    ProcessParametersClear.headzone6temp  = (ActiveProcessParameters.headzone6temp <80)? ActiveProcessParameters.headzone6temp  :80;
+    ProcessParametersClear.dyeingspeed    = (ActiveProcessParameters.dyeingspeed   <40)? ActiveProcessParameters.dyeingspeed    :40;
     if (HandleProcessParameters(&ProcessParametersClear)!= OK)
     {
         LOG_ERROR (1, "Turn Heaters idle failed");