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

1 files changed, 9 insertions, 9 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index d16683967..554e4d1ef 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -1117,8 +1117,8 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
             LoadStatus = OK;
             SecondTry = true;
             load.color = BLINK;
-            if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
-                ThreadLoadingRestartReport();
+            //if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
+            //    ThreadLoadingRestartReport();
             Report("Calling State machine retry",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0);
             ThreadLoadStateMachine(LoadStages);
         }
@@ -1127,8 +1127,8 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
             SecondTry = false;
             Report("Calling State machine  2nd try",__FILE__,LoadStages,LoadStatus,RpMessage,SecondTry,0);
             load.color = BLINK;
-            if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
-                ThreadLoadingRestartReport();
+            //if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
+            //    ThreadLoadingRestartReport();
             ThreadLoadStateMachine(LoadStages+1);
         }
         else //((SecondTry == false)&&(TryAgain == false))???????
@@ -1140,8 +1140,8 @@ uint32_t ThreadLoadButton(THREAD_LOAD_STAGES_ENUM ReadValue)
     else
     {
         Report("Calling State machine status OK",__FILE__,ReadValue,LoadStatus,RpMessage,SecondTry,0);
-        if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
-            ThreadLoadingRestartReport();
+        //if (LoadStages > THREAD_LOAD_INITIAL_TENSION)
+        //    ThreadLoadingRestartReport();
         ThreadLoadStateMachine(LoadStages);
         SecondTry = false;
     }
@@ -1501,12 +1501,9 @@ uint32_t ThreadLoadingRestartReport(void) //sending after a failure in the final
 
 uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer)
 {
-    TryThreadLoadingRequest *request;
     TryThreadLoadingResponse Cresponse = TRY_THREAD_LOADING_RESPONSE__INIT;
     MessageContainer responseContainer;
     //MessageState = 2;
-    if (requestContainer)
-        request = try_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
     ThreadLoadingReport();
     Report("TryThreadLoadingFunc",__FILE__,__LINE__,MESSAGE_TYPE__TryThreadLoadingResponse,RpWarning,(int)LoadStages,0);
 
@@ -1556,6 +1553,9 @@ uint32_t ContinueThreadLoadingFunc(MessageContainer* requestContainer)
         {
             dryerbufferlength = request->processparameters->dryerbufferlength;
             LoadArmRounds = (int)(request->processparameters->dryerbufferlength);
+            windertension = request->processparameters->windertension;
+            pullertension = request->processparameters->pullertension;
+            memcpy (&ProcessParametersRecover,request->processparameters,sizeof(ProcessParameters));
 
         }
         Report("ContinueThreadLoadingFunc",__FILE__,__LINE__,(int)(request->processparameters->dryerbufferlength),RpWarning,(int)LoadStages,0);