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

1 files changed, 8 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 2b1e52134..fe664c16f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -345,6 +345,8 @@
                 {
                     LoadStages++;
                     LoadStatus = OK;
+                    SecondTry = false;
+                    TryAgain = false;
                     if (LoadStages == THREAD_LOAD_CLOSE_DANCERS)
                     {
                         MotorSetKvalHold(HARDWARE_MOTOR_TYPE__MOTO_RDANCER, keepkvalhold);
@@ -607,6 +609,8 @@
                 LoadStages++;
                 ThreadLoadStateMachine(LoadStages);
                 LoadStatus = OK;
+                SecondTry = false;
+                TryAgain = false;
             }
             else
             {
@@ -654,7 +658,8 @@
             if (CallbackCounter == 0)
             {
                 LoadStatus = OK;
-
+                SecondTry = false;
+                TryAgain = false;
                 LoadStages++;
                 if (LoadStages != THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call
                 {
@@ -1614,7 +1619,8 @@ uint32_t ContinueThreadLoadingFunc(MessageContainer* requestContainer)
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
     SendChars((char*)container_buffer, container_size);
-    if (LoadStages == THREAD_LOAD_INITIAL_TENSION) //on this satge we should wait for user call
+    //if (LoadStages == THREAD_LOAD_INITIAL_TENSION) //on this stage we should wait for user call
+    //commented out - error retry is only with this message
     {
         ThreadLoadStateMachine(LoadStages);
     }