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

1 files changed, 7 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 2b65ca806..f5bc45d85 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -204,6 +204,7 @@
             strcpy(LoadErrorMsg,"Thread_Load_Reduce_Heat failed");
             LoadStatus = ERROR;
             TryAgain = true;
+            //ThreadLoadButton(LoadStages);
         }
         else
         {
@@ -300,6 +301,7 @@
                     LoadStatus = ERROR;
                     ThreadLoadingReport();
                     TryAgain = true;
+                    //ThreadLoadButton(LoadStages);
                 }
                 else
                 {
@@ -544,6 +546,7 @@
                 LoadStatus = ERROR;
                 ThreadLoadingReport();
                 TryAgain = true;
+                //ThreadLoadButton(LoadStages);
             }
         }
 
@@ -647,6 +650,7 @@
             Report("Total Feeder load",__FILE__,__LINE__,dryerbufferCentimeters,RpMessage,TotalLoadedLen,0);
 
             ThreadLoadingReport();
+            //ThreadLoadButton(LoadStages);
         }
         return OK;
     }
@@ -857,6 +861,7 @@
             LoadStatus = ERROR;
             TryAgain = true;
             ThreadLoadingReport();
+            //ThreadLoadButton(LoadStages);
         }
         return OK;
     }
@@ -971,7 +976,7 @@
     uint32_t ThreadLoadStateMachine( THREAD_LOAD_STAGES_ENUM ReadValue)
     {
         REPORT_MSG(ReadValue,"ThreadLoadStateMachine");
-        ThreadLoaded();
+        //ThreadLoaded();
         ThreadLoadingReport();
 
         if (LoadStages!=ReadValue)
@@ -1089,7 +1094,7 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
             Report("Calling State machine",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0);
             ThreadLoadStateMachine(LoadStages);
         }
-        else
+        else if (SecondTry == true)
         {
             SecondTry = false;
             Report("Calling State machine",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0);